Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:16:24 +0000 (09:16 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:16:51 +0000 (09:16 +0100)
Change-Id: I44631ce9d9a6aba090d01911ff62b56043510c9c


Trivial merge