Merge branch 'lsk-3.10-gator-5.18' into lsk-3.10-gator
authorJon Medhurst <tixy@linaro.org>
Thu, 12 Jun 2014 13:01:48 +0000 (14:01 +0100)
committerJon Medhurst <tixy@linaro.org>
Thu, 12 Jun 2014 13:01:48 +0000 (14:01 +0100)

Trivial merge