upstream/6+20090307

Ben Hutchings

@benh

45c3b281 · Imported Upstream version 6+20090307 · Jul 14, 2010

Upstream version 6+20090307