Merge branch 'atsushi'
authoratsushieno <atsushi@ximian.com>
Wed, 28 Jul 2010 16:12:41 +0000 (01:12 +0900)
committeratsushieno <atsushi@ximian.com>
Wed, 28 Jul 2010 16:12:41 +0000 (01:12 +0900)

Trivial merge