merge trunk
commit179a3f11d15cbc6e433f05e03cc7e40fd5ce8362
authorKenichi Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (23 21:04 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (23 21:04 +0900)
tree1ce423b654c3470460625730f3f42585bf5f770f
parentbc9a50032c477d4276583e66312806540167007d
parent7764286ea69667380175fe156c4e82bf789a1e09
merge trunk