upstream/6+20080913

Ben Hutchings

@benh

39ef3290 · Imported Upstream version 6+20080913 · Jul 14, 2010

Upstream version 6+20080913