Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 14 Mar 2011 09:34:36 +0000 (11:34 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 14 Mar 2011 09:34:36 +0000 (11:34 +0200)
commitee7a763cfbee3596497779146e5726d8f17afcf5
treeb350f6e09791c6f7fdde877292a8bf5dec8798cf
parent654ecdc6bf6145124abfd1dd0fd9801700344237
parenta5434cd2817507de25168f6570363aa9715b5a08
Merge branch 'master' into harmattan