Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Tue, 14 Jan 2014 20:48:50 +0000 (12:48 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 14 Jan 2014 20:48:50 +0000 (12:48 -0800)

Trivial merge