Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 12 Apr 2013 10:55:44 +0000 (12:55 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 12 Apr 2013 10:55:44 +0000 (12:55 +0200)
Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192


Trivial merge