Merge changes
authorGerrit Code Review <git@Maetan>
Tue, 24 May 2011 06:22:34 +0000 (15:22 +0900)
committerGerrit Code Review <git@Maetan>
Tue, 24 May 2011 06:22:34 +0000 (15:22 +0900)

Trivial merge