Merge remote-tracking branch 'libpinyin/master'
authorPeng Wu <alexepico@gmail.com>
Mon, 8 Oct 2012 03:22:08 +0000 (11:22 +0800)
committerPeng Wu <alexepico@gmail.com>
Mon, 8 Oct 2012 03:22:08 +0000 (11:22 +0800)

Trivial merge