Merge remote branch 'origin/armv7' into develop
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:19:58 +0000 (18:19 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:19:58 +0000 (18:19 +0100)

Trivial merge