Merge remote-tracking branch 'agreen/for-nicolas' into linaro-2.6.38