merge trunk
commit73b1b3ad6196234984a29298bc66eabf1299de66
authorKenichi Handa <handa@gnu.org>
Sat, 29 Jun 2013 03:44:38 +0000 (29 12:44 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 29 Jun 2013 03:44:38 +0000 (29 12:44 +0900)
treed6134992dc11f06d34531f606d94b8484e8bdfde
parent2ed909207ee7afb93284d113526071e83fc1a5c1
parent4366ddd49823876d2b366e108a824e12706b0379
merge trunk