Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 3 Dec 2010 12:02:41 +0000 (14:02 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 3 Dec 2010 12:02:41 +0000 (14:02 +0200)
commitcaf7fb375e5e8a264442c1a72e13918ddb5e578c
tree89dd7e42a4ea22ff2a0092ff8dc4222d7b7772a8
parent383537863eef41677d4d5a68d06214ca029b546b
parent248b95106942bb17b05b6f917d4759a52bb57bb4
Merge branch 'master' into harmattan