Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Thu, 23 Feb 2012 11:45:07 +0000 (11:45 +0000)
committerJon Medhurst <tixy@linaro.org>
Thu, 23 Feb 2012 11:45:07 +0000 (11:45 +0000)

Trivial merge