Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Thu, 10 Apr 2014 10:24:17 +0000 (11:24 +0100)
committerJon Medhurst <tixy@linaro.org>
Thu, 10 Apr 2014 10:24:17 +0000 (11:24 +0100)
commit81e9a122ea802cf8fcaddfc91c3912e7076eed6e
tree05d04cfbaacb92c3586f7dbe2b62c649a44e6e95
parent69bc176e17316fdbe8af50d68beb15fe5f00afed
parentb7d5d4453493920a30a4a872cefa6daeaa3fb925
Merge branch 'master' into android