Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 17 Jun 2013 12:29:43 +0000 (13:29 +0100)
committerJon Medhurst <tixy@linaro.org>
Mon, 17 Jun 2013 12:29:43 +0000 (13:29 +0100)
commit567aa4e79aa4450eb32528b6acda62f18ae76596
tree747c381b968e6d044cdaefa4a64c5295566e2764
parent4187fbf69e3cd436cfd3c93948492296e99e918c
parentf15a1807ecf7af6dd0cac9e175ff00bf06d7c304
Merge branch 'master' into android