Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 10 Apr 2013 08:00:34 +0000 (10:00 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 10 Apr 2013 08:01:52 +0000 (10:01 +0200)
Change-Id: I958754b1f51ecdaf465faa7700d4e57f2df926fc


Trivial merge