Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 12:53:29 +0000 (14:53 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 12:53:29 +0000 (14:53 +0200)
Change-Id: Ieb4590cfd49bd002f0ae0b4799e39b5a402900fd


Trivial merge