Commit 4fc602d2cb7b104de19f7a7a00e7508723d83f56

Kentaro Fukuchi 2012-04-21T17:53:33

Merge commit '690cf32'