Commit 8322e2c5e0039d50730d28c45e8ae195eea43940

Kentaro Fukuchi 2013-07-29T18:32:46

Merge branch 'master' into 3.4