merge trunk
commit4eb4de01df384be9b8d811f7ab476eeb37ece748
authorKenichi Handa <handa@m17n.org>
Tue, 28 Aug 2012 13:44:20 +0000 (28 22:44 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 28 Aug 2012 13:44:20 +0000 (28 22:44 +0900)
treed04f0dae31dd8b533a0c3cd738430841ce7ebb84
parentfabc1281e9cde34ff9a19d843316d2ceca8647ad
parent4f2daf31078e2cc059710e129dffe0beed8fc7c2
merge trunk