upstream/3.0_svn5131

Stephen Kitt

@skitt

dd8ef980 · Imported Upstream version 3.0~svn5131 · Jun 23, 2012

Upstream version 3.0~svn5131