Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Wed, 20 Oct 2010 06:37:05 +0000 (09:37 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Wed, 20 Oct 2010 06:37:05 +0000 (09:37 +0300)
commit0792824104ba281964d436397fe5d9564bf1fc05
tree4b996f7c46e458c71eda517c0f435798a12d1501
parent2d20fecfd6b8809e8633da8bbd97deb6b7031088
parentca3db7f503dbee116202be85d570ad79ee8c9e18
Merge branch 'master' into harmattan