Merged changes in the trunk up to revision 43040.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 31 Dec 2011 21:12:44 +0000 (21:12 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 31 Dec 2011 21:12:44 +0000 (21:12 +0000)

Trivial merge