Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:36:25 +0000 (09:36 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:37:19 +0000 (09:37 +0100)
Change-Id: Ifa5ddfd7ee4a637f78947fc1cb945d3008506973


Trivial merge