Merged changes in the trunk up to revision 46057.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 29 Apr 2012 01:51:25 +0000 (01:51 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 29 Apr 2012 01:51:25 +0000 (01:51 +0000)

Trivial merge