Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Wed, 3 Apr 2013 13:14:37 +0000 (14:14 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 3 Apr 2013 13:14:37 +0000 (14:14 +0100)

Trivial merge