Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Fri, 10 Aug 2012 13:46:05 +0000 (14:46 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 10 Aug 2012 13:46:05 +0000 (14:46 +0100)

Trivial merge