upstream/6+20090323

Ben Hutchings

@benh

f4319829 · Imported Upstream version 6+20090323 · Jul 14, 2010

Upstream version 6+20090323