Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Wed, 16 May 2012 13:34:10 +0000 (14:34 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 16 May 2012 13:34:10 +0000 (14:34 +0100)
commitcf81facb732aa92b23e5bba77a9b711fdfb73297
tree0d56e46ba2cd84e5abcdcedf4b1f634389aee0ab
parent097d741a276a55d6f89bb5e65439b95f9abedaf5
parent401972d0edd099668c8ea86bb6db71c4067a2dfb
Merge branch 'master' into android