Merge branch 'harmattan' into pr1.2_test pr1.2 harmattanpr12/0.15.3
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 23 Jan 2012 12:33:25 +0000 (14:33 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 23 Jan 2012 12:33:25 +0000 (14:33 +0200)
commit85d06115d668b9e1382b3b29b6d1cc1d9d159e0c
tree053fab44450abe8bebc41c45e4320e671e5b2a46
parent1794e9b7eed83a01fb776063f4efbd48c5c2130c
parentd64f3961924eb0b67d5aebea2d95a3ad484b1692
Merge branch 'harmattan' into pr1.2_test

Conflicts:
debian/changelog
debian/changelog