Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
authorBill King <bking@trolltech.com>
Tue, 9 Feb 2010 06:11:09 +0000 (16:11 +1000)
committerBill King <bking@trolltech.com>
Tue, 9 Feb 2010 06:11:09 +0000 (16:11 +1000)
commit3318d412cb78a545790761161f243cb49da4abb7
tree62d6612926f7bbcce8a1a28cbdb1a382339aa566
parent7370dceadf969288a22c564728398cc7cb119d82
parent72f3caa5d7821b93a4e807fb61c5cda9f2c6f393
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6