Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Thu, 19 Dec 2013 11:17:40 +0000 (11:17 +0000)
committerJon Medhurst <tixy@linaro.org>
Thu, 19 Dec 2013 11:17:40 +0000 (11:17 +0000)

Trivial merge