Merge branch 'beta6-ringzero' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into beta6-ringzero
Merge branch 'beta6-ringzero' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into beta6-ringzero