Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Thu, 10 Apr 2014 10:24:17 +0000 (11:24 +0100)
committerJon Medhurst <tixy@linaro.org>
Thu, 10 Apr 2014 10:24:17 +0000 (11:24 +0100)

Trivial merge