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)
commit4c7cf996b31246f8094e5717dbf5ad291d50ef34
treec0c548d22ba3f8264d9d958aca29fd52c8ff0863
parentac510b08741d72d89da5f909ad483f7080e46fea
parent2ccfda6ba471ba1722fe48d23767d9d024bd0750
Merge branch 'master' into android