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