Merge branch 'lsk-3.10-gator-5.20' into lsk-3.10-gator
authorJon Medhurst <tixy@linaro.org>
Thu, 30 Oct 2014 18:07:34 +0000 (18:07 +0000)
committerJon Medhurst <tixy@linaro.org>
Thu, 30 Oct 2014 18:07:34 +0000 (18:07 +0000)

Trivial merge