Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Fri, 18 May 2012 08:07:18 +0000 (09:07 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 18 May 2012 08:07:18 +0000 (09:07 +0100)

Trivial merge