Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Thu, 19 Dec 2013 11:17:40 +0000 (11:17 +0000)
committerJon Medhurst <tixy@linaro.org>
Thu, 19 Dec 2013 11:17:40 +0000 (11:17 +0000)
commit69bc176e17316fdbe8af50d68beb15fe5f00afed
tree0ab6a949997668cae577e6f230c0a6fe8ede30f7
parent083e2c810edc59b07945f526703a46b49aba9575
parent33bef9ed7feca41e7cd6de8bf5d80052669278d3
Merge branch 'master' into android