Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 6 Jun 2011 08:27:39 +0000 (11:27 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 6 Jun 2011 08:27:39 +0000 (11:27 +0300)
commit14b01c52e91932dcd3c27b5d925871aa6c7feea5
tree091667de9d63461cdb96ac886e0e7286fbf82923
parent2457cd5ab3ef067959b020a141dac81b2a6f4f46
parent89d10efd8d6dae29499a3b3c288c7fb39026ddb6
Merge branch 'master' into harmattan