Commit 12f5b16ddd97ce063b9a671415f461219bcb6bd5

Kentaro Fukuchi 2012-01-19T20:18:39

Merge branch 'master' into 3.2