Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts: distrib/platform_release.py
Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts:
distrib/platform_release.py