Merge branch 'master' into harmattan
authordominic <dominic@dominic.apac.nokia.com>
Tue, 11 Jan 2011 09:55:49 +0000 (15:25 +0530)
committerdominic <dominic@dominic.apac.nokia.com>
Tue, 11 Jan 2011 09:55:49 +0000 (15:25 +0530)
commit3f422db47fde712f03e918304b85fdb75ad708b8
tree29360f1883cee9898aa7bd3f9e57c53f4a4a7fa6
parentbd98ec08eae5dd0b1a84bee09c3b853b85d7d672
parentdc574e21bf97b55f3e97e6d65212f1c7340992f0
Merge branch 'master' into harmattan