Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Fri, 18 May 2012 08:07:18 +0000 (09:07 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 18 May 2012 08:07:18 +0000 (09:07 +0100)
commitac510b08741d72d89da5f909ad483f7080e46fea
tree06ddf5fdd7dbaf5171c648145d1a2027aaa4e18d
parentcf81facb732aa92b23e5bba77a9b711fdfb73297
parentf7e8a3d4bed65fb0fdb846f53aad7b0a763767c7
Merge branch 'master' into android