[MERGE] Commit updates sha-cache

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> Refreshed for NEWS conflicts
> 

BB:approve
John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjbwp8ACgkQJdeBCYSNAAPwZQCcD0bD3DLUy37LDqBmaH5UTr9r
4kIAoMpJjYY9xso8KoTP1PaK/+CaoUxv
=sRWG
-----END PGP SIGNATURE-----