Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 10:29:22 +0000 (12:29 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 10:29:22 +0000 (12:29 +0200)
commit01e04f1c7761d420005ed0b00b5b102f5b2642c0
tree03c8883b60b124ef79b96f33bdf304ef55f8699b
parent8b59e499cf94cec5307c5df7d7d4e23eba46d9d2
parent543c92cb3a2d7e0fe7d145f677bfbea311cb6510
Merge branch 'master' into harmattan