Commit 78a3d7e8ea80c17f500b75ccdc2f4b80ba4d31ae

Kentaro Fukuchi 2013-06-19T00:31:32

Merge branch '3.4'