Commit 675443ad71f118b17259e9d551538ec5d93a5793

Kentaro Fukuchi 2012-10-19T12:13:24

Merge branch '3.4'