Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:25:25 +0000 (09:25 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:25:25 +0000 (09:25 +0100)
Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879


Trivial merge