Merge branch 'pr1.0' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Wed, 13 Jul 2011 09:53:45 +0000 (12:53 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Wed, 13 Jul 2011 09:53:45 +0000 (12:53 +0300)
commit00c3365b3d6544fa27ca101dc775d72e8bffc700
tree9e772f885f02983601418a2f1aba88267795bb14
parent23aa88247ba0ce8f43cde5b46c245d5ede7d865c
parentd86a1a8459bea80cb3d84e961cc8bba24813add5
Merge branch 'pr1.0' into harmattan