Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:26:22 +0000 (19:26 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:26:22 +0000 (19:26 +0200)
Change-Id: I70792d10fb83d92b3b60e64b89c4dbf8144ccba5


Trivial merge