Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 14 Sep 2010 08:41:03 +0000 (11:41 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 14 Sep 2010 08:41:03 +0000 (11:41 +0300)
commit0193de353184354595167978bf0d39eff596b687
treed92ba03b398fab68e713dc751970eb3cdea0e932
parent1dba54fad1432a3b58a9afa2d4cd43541f928726
parentac2e1e3688054ca7cef6cecde82edee0c660e5af
Merge branch 'master' into harmattan