Merge branch 'tests'
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 23 Nov 2010 12:24:20 +0000 (14:24 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 23 Nov 2010 12:24:20 +0000 (14:24 +0200)
commitc5f4440bdc589ff4ae3e3b7cd0f34a32ac098731
tree7a71a92de3662c5bf9850d1ba22a35516e73b8b2
parent9d6a31b234a1e42a62b53920fca1d121b53eab67
parent6aed6f2cdc06431f4467a3b96b8f4f3f53bae90a
Merge branch 'tests'