jumperchen/zk — pull request #12 by mangosgoo (2012-05-04 02:24:53+00:00)
Title: B60 1234

fix conflict