Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 9 Jun 2010 09:12:47 +0000 (12:12 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 9 Jun 2010 09:12:47 +0000 (12:12 +0300)
commit256525c4cdc47ecf968a17323c567b0d2235d976
tree6baff7c2b3296fc6bce1064d7cbd74f03fcb162c
parent17e7363bcb48bda524e7374416dcc05235b0eb9f
parent7cb02053d6491fb4cac362ed070b7cc4d4c7f628
Merge branch 'master' into harmattan