Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 5 Mar 2012 10:23:35 +0000 (10:23 +0000)
committerJon Medhurst <tixy@linaro.org>
Mon, 5 Mar 2012 10:23:35 +0000 (10:23 +0000)

Trivial merge