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)
commitfb4dafedc0179ce8499eb01d5c57b6d348101a57
tree2d8431fc6c318e2a2a97bd71ae6eb42ad39fb5e3
parentb62ed223f69874d653d271bc9c848027115f6784
parented3bcd4606e29d86e54702c5ac0e261e8f82b968
Merge changes