Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:30 +0000 (13:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:30 +0000 (13:15 +0200)
Change-Id: I4556ce5965020154a563cef9613305cafae3c674


Trivial merge