Merge branch 'new-order-phase4' of ssh://skyjake@deng.git.sourceforge.net/gitroot/deng into new-order-phase4
Merge branch 'new-order-phase4' of ssh://skyjake@deng.git.sourceforge.net/gitroot/deng into new-order-phase4