Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Fri, 11 Oct 2013 08:23:58 +0000 (09:23 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 11 Oct 2013 08:23:58 +0000 (09:23 +0100)

Trivial merge