upstream/20130615+dfsg

Nobuhiro Iwamatsu

@iwamatsu

cc46862f · Imported Upstream version 20130615+dfsg · Jul 15, 2013

Upstream version 20130615+dfsg