Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Fri, 26 Apr 2013 12:29:23 +0000 (13:29 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 26 Apr 2013 12:29:23 +0000 (13:29 +0100)
commit4187fbf69e3cd436cfd3c93948492296e99e918c
treec025c5c3a9ee2aa424e90e349bdad3a69be73f27
parentda2c4ac36164e6bbc450d3105c00c0b88c55c865
parentb69d31aa944d1c6aea0f54399fb754127ad2ab18
Merge branch 'master' into android