Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 15 Aug 2013 18:56:56 +0000 (20:56 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 15 Aug 2013 18:56:56 +0000 (20:56 +0200)
Change-Id: I3953f2473e3b2cf9768286fef1c5efd08c61c6f0


Trivial merge