upstream/11-20080603

Hideki Yamane

@henrich

521a654f · Imported Upstream version 11-20080603 · Jun 04, 2013

Upstream version 11-20080603