merge trunk
commit6fc286aee5eb67bf4acb9f67c3b5d363ee4b427b
authorKenichi Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (1 00:04 +0900)
committerKenichi Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (1 00:04 +0900)
tree596c420d60e3980a1195300a563efb6fe8404c86
parent04311a1648bd0ba44951f89557f5674dfa032376
parent0bbd0e0b1d5f358c85506dcc5451e14fb95864a8
merge trunk