Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 17 Sep 2010 09:04:27 +0000 (12:04 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 17 Sep 2010 09:04:27 +0000 (12:04 +0300)
commitdcfc3607b937ec8fac18bcc6bfb5d004351a1cd5
tree233774e727f191287f3b59aca779e6df9dfcab03
parent07e10bc31b3f30d4ff335a272b5ad33d24b7da93
parentcea29d536bd1a6e3b422eb8d0b87efc801dd00ae
Merge branch 'master' into harmattan