Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:45 +0000 (16:06 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:45 +0000 (16:06 +0200)
Change-Id: I905886417147ceb529ded43896939f65e66d7424


Trivial merge