Merge branch 'db-version'
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 23 Nov 2010 11:30:14 +0000 (13:30 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 23 Nov 2010 11:30:14 +0000 (13:30 +0200)
commit2a1525fea2c7ec61b2c931fa7bc673e9575e1772
tree52f32dc0271c5a98988d05914f4e0c34cf89534c
parent153089e3245cbf6a9bc7538db34c63e49e2b40c8
parent6e725cfa1f8970d55370b3773dc4ba98e252bd63
Merge branch 'db-version'