Updated sources (clobbered, Linaro 4.7.4)