Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 08:07:03 +0000 (11:07 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 08:07:03 +0000 (11:07 +0300)
commitbf3159f6145e1ad966f887dc3ee32fb2e5e1c8c9
treecba2389822e28153a043be33aad40e27a412782a
parent8a9eaf089d9897de60d46527d7b07b5683b8dcbe
parent6bed90d3fe1e9a70f40a81423cc3d100de2a6f6c
Merge branch 'master' into harmattan
doc/doc.pri