Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:28:22 +0000 (16:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:28:22 +0000 (16:28 +0200)
Change-Id: Ic056eeec62fbbbf5c932d8e862736f368833f34d


Trivial merge