Merge branch 'autostr-and-garbage' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into autostr-and-garbage
Merge branch 'autostr-and-garbage' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into autostr-and-garbage