Merge branch 'master' into topic/xs-accessor
gfx [Wed, 19 Aug 2009 02:35:39 +0000 (11:35 +0900)]

Trivial merge