Merge branch 'pr1.0' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 23 Jun 2011 10:07:23 +0000 (13:07 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 23 Jun 2011 10:07:23 +0000 (13:07 +0300)
commit5498bdd155cf8a53696345bd21eac1fe8c535976
treee413d80e0a891d0e9c5aca669b5c6ec8ad1a8665
parent0437f47f9a11aec72748be3ba9136aaa6cf88feb
parent11b5c8cca66310746c9ec413f52465fb89266654
Merge branch 'pr1.0' into harmattan