Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:27:14 +0000 (14:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:27:14 +0000 (14:27 +0100)
Change-Id: I324152dc6eec44e4f5524ff87b136f0ae20635c0


Trivial merge