Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 20 Jan 2012 12:19:50 +0000 (14:19 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 20 Jan 2012 12:19:50 +0000 (14:19 +0200)
commit1e3253e2d15465e975e1ba876c723939bf36b0f9
treed6f774f718fc533865d4789cff27081033e52222
parentf704d01b9f7e271ba3c3048fd9c206bd4c1e6238
parentc0160b90319128b8ec869f40ffea2321f4718f14
Merge branch 'master' into harmattan