Merged changes in the trunk up to revision 30416.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 16 Jul 2010 21:35:48 +0000 (21:35 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 16 Jul 2010 21:35:48 +0000 (21:35 +0000)

Trivial merge