Merge branch 'master', remote branch 'upstream/master'
changed test to be less specific to MySQL
Merge branch 'master' of git://github.com/stefanofontanelli/ColanderAlchemy
Merge pull request #34 from tisdall/master

slightly modified one test so it's less MySQL specific