Merge branch 'ringzero+master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into ringzero+master
Merge branch 'ringzero+master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into ringzero+master