Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:50:28 +0000 (09:50 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:50:32 +0000 (09:50 +0100)
commit84921c981414c1858b4302d16b98a7cb75593e0c
treee77d23dc45f3a8211348448b1900f21e3ff32231
parent2020e988ee673535670fb6901ad23ee6750d02e2
parent9a30672d4a41c45123fbd2928d7e55132dfec34f
Merge branch 'stable' into release

Change-Id: Ie98e2c20c7096ceb1f5a46b4e9fa5b750808ed43