Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 17 Jun 2013 12:29:43 +0000 (13:29 +0100)
committerJon Medhurst <tixy@linaro.org>
Mon, 17 Jun 2013 12:29:43 +0000 (13:29 +0100)

Trivial merge