commit by liu.wenju 20130409
Merge branch 'master' of https://github.com/ausdauernd/nnkzdb
commit by liu.wenju 20130409