Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Tue, 12 Nov 2013 22:23:31 +0000 (14:23 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 12 Nov 2013 22:23:31 +0000 (14:23 -0800)

Trivial merge