merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 12 Jan 2014 23:26:08 +0000 (08:26 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 12 Jan 2014 23:26:08 +0000 (08:26 +0900)
commit1a0778b078b9ffaa68e1ae0d4b26de147872b421
tree993d3a684b6c08a7cdd98fd8827ddd058931ebc9
parent67671fb1dcbfd46ddee7e753d6f545d25821d445
parentb30dee657df010645703150248a33f3e22a002d2
merge trunk