Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 7 Feb 2011 10:01:08 +0000 (12:01 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 7 Feb 2011 10:01:08 +0000 (12:01 +0200)
commitfe4d3f3ec728935b61baa61c1e1e393e64d7810c
tree80e36a02f058761b898c2124c5c0119e06d8dd7d
parent46c426a671a9b292119261436ff4ecfd1fac9640
parent7fe6f178b5a79ce623cbcef4774eec0e2b8d9cd4
Merge branch 'master' into harmattan