Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Fri, 11 Oct 2013 08:23:58 +0000 (09:23 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 11 Oct 2013 08:23:58 +0000 (09:23 +0100)
commit083e2c810edc59b07945f526703a46b49aba9575
tree174b6db0f608329711f68ba52fe6f80069770240
parent567aa4e79aa4450eb32528b6acda62f18ae76596
parent6f4705753bf6ede126239aa56eb518dfc4397b11
Merge branch 'master' into android