Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 7 Dec 2010 11:03:04 +0000 (13:03 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 7 Dec 2010 11:03:04 +0000 (13:03 +0200)
commitb49df62c0a87d2d2f649112a2bd8fe707ff57f09
treee2cc5f1e8f56bc9ed37ec80ffb5dfd2920524e04
parent7fabb0dff639c48720673949e7a25e7780d72675
parentab3269da1ff4450258a11219232a4383374d85b5
Merge branch 'master' into harmattan