Merge branch 'master' into android android master
authorJon Medhurst <tixy@linaro.org>
Thu, 24 Apr 2014 14:23:44 +0000 (15:23 +0100)
committerJon Medhurst <tixy@linaro.org>
Thu, 24 Apr 2014 14:23:44 +0000 (15:23 +0100)
commitce2784285261bd64ce3c49a9e1c5f6624854cc99
tree779d2d7cbed00255011510713e2ec49fec8740bd
parent81e9a122ea802cf8fcaddfc91c3912e7076eed6e
parentba783f1443773505231ac2808c9a3716c3c2f3ae
Merge branch 'master' into android