Merge branch 'atsushi'
authoratsushieno <atsushi@ximian.com>
Wed, 28 Jul 2010 09:02:33 +0000 (18:02 +0900)
committeratsushieno <atsushi@ximian.com>
Wed, 28 Jul 2010 09:02:33 +0000 (18:02 +0900)

Trivial merge