Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 5 Nov 2012 11:20:25 +0000 (11:20 +0000)
committerJon Medhurst <tixy@linaro.org>
Mon, 5 Nov 2012 11:20:25 +0000 (11:20 +0000)

Trivial merge