Merge branch 'lsk-3.10-gator-5.19' into lsk-3.10-gator
authorJon Medhurst <tixy@linaro.org>
Mon, 4 Aug 2014 14:52:55 +0000 (15:52 +0100)
committerJon Medhurst <tixy@linaro.org>
Mon, 4 Aug 2014 14:52:55 +0000 (15:52 +0100)

Trivial merge