merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 21 Mar 2012 07:43:58 +0000 (16:43 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 21 Mar 2012 07:43:58 +0000 (16:43 +0900)
commit136220349968063bef3f249baddba30a24b52ec2
treec9da83473ae16e2d2226523d16dfc5555d56b95c
parent26090a2783518afc82bb907a28e32749542fead6
parentfb5b8aca9928223c3fef042f1de4b50cd08fde43
merge trunk