Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 22 Sep 2011 09:03:11 +0000 (12:03 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 22 Sep 2011 09:03:11 +0000 (12:03 +0300)
commitd28cd160b0ff73bc55938b72f7736f0f5827932f
treeda93142ba60012fc65b967d97d1dce770852adb4
parent8c938bb67a2cd65fbb642428936b2b1a391459f2
parent609f4c28ad49d4ca8f6980cc03e43323096a221a
Merge branch 'master' into harmattan