Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 20 Jan 2012 11:29:30 +0000 (13:29 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 20 Jan 2012 11:29:30 +0000 (13:29 +0200)
commitf1706c9e2383ae00a5e3ae987c2857ae5313482b
treed7a7f42c691157d7724ffdba6ea5b9ee62af0f12
parent98b97a448611e4b9e130b6b36651854eb66e13f6
parent462cc019902835563fd3b829868dd8b8a9f7b874
Merge branch 'master' into harmattan