Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:26:16 +0000 (09:26 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:26:30 +0000 (09:26 +0100)
commitc5b60caf11a22f179aea0b207e9480fc2fdebd4d
treefff360a5ff595306a93dafead87b1bd5c1656f51
parentf94348510f6aa2f8a6c4e304a90510ac2da63b8e
parentf377f4960a82bf96bdeda91d60458329180f754c
Merge branch 'stable' into release

Change-Id: Ic5a64ac86998e5a55f1b988e1b750873809e5a29