Merge lp://staging/~cjwatson/storm/move-tests into lp://staging/storm

MANIFEST.in (+1/-2)
NEWS (+2/-0)
setup.py (+1/-1)
storm/tests/__init__.py (+5/-4)
storm/tests/base.py (+1/-2)
storm/tests/cache.py (+1/-2)
storm/tests/database.py (+2/-3)
storm/tests/databases/base.py (+2/-3)
storm/tests/databases/postgres.py (+5/-5)
storm/tests/databases/sqlite.py (+2/-3)
storm/tests/event.py (+1/-2)
storm/tests/expr.py (+1/-2)
storm/tests/helper.py (+1/-1)
storm/tests/info.py (+1/-2)
storm/tests/infoheritance.txt (+2/-1)
storm/tests/properties.py (+7/-7)
storm/tests/schema/patch.py (+1/-1)
storm/tests/schema/schema.py (+1/-1)
storm/tests/schema/sharding.py (+1/-2)
storm/tests/sqlobject.py (+1/-2)
storm/tests/store/base.py (+2/-3)
storm/tests/store/postgres.py (+2/-3)
storm/tests/store/sqlite.py (+2/-3)
storm/tests/tracer.py (+2/-3)
storm/tests/tutorial.txt (+1/-1)
storm/tests/twisted/transact.py (+4/-4)
storm/tests/uri.py (+1/-2)
storm/tests/variables.py (+1/-2)
storm/tests/zope/adapters.py (+2/-2)
storm/tests/zope/testing.py (+6/-2)
storm/tests/zope/zstorm.py (+2/-2)
test (+1/-1)