Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Tue, 22 Mar 2011 06:42:17 +0000 (08:42 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Tue, 22 Mar 2011 06:42:17 +0000 (08:42 +0200)
commit49f8d79a7b1bdd4883bd33c72455b374c4fe9e46
treed333e81101e210d1c2e82c03fdcb416b1911ecbe
parentde1fdffa94a95acd33fa6c8b4332034f4846675a
parent6b0e194df58133224712ecd3d91bbfa73d44497d
Merge branch 'master' into harmattan