Commit changes.
Merge branch 'master' of ssh://192.168.10.207:1022/~/emacs-for-python
Imp's configuration intermediate state.
Merge with upstream.
Merge with upstream.