Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 3 Nov 2010 15:52:27 +0000 (17:52 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 3 Nov 2010 15:52:27 +0000 (17:52 +0200)
commit8db3748eab9102ec76f021a59398541cded10321
treecda36b6f8f8c7455cbc13f54bd71e6ebbfc261ae
parentf42dd5657a3d2fe4f5e5a6399006b2dbb7fce0bc
parente0ebffd37fe7b40798f21bbd9af99fd4c946529a
Merge branch 'master' into harmattan