Merge branch 'atsushi'
authoratsushieno <atsushi@ximian.com>
Wed, 28 Jul 2010 15:11:13 +0000 (00:11 +0900)
committeratsushieno <atsushi@ximian.com>
Wed, 28 Jul 2010 15:11:13 +0000 (00:11 +0900)

Trivial merge