Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Fri, 13 Jul 2012 09:57:08 +0000 (10:57 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 13 Jul 2012 09:57:08 +0000 (10:57 +0100)

Trivial merge