Revert PS1 to earlier version, plus __git_ps1

When I turned on the Git prompt, I overlooked the fact that we already
had a definition for PS1.  So let's go back to the old version, but add
__git_ps1 instead.

Noticed by demodevil@gmail.com.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

etc/profile

@@ -66,9 +66,6 @@ for i in /etc/profile.d/*.sh ; do
 done
 
 export MAKE_MODE=unix
-export PS1='\[\033]0;$MSYSTEM:\w\007
-\033[32m\]\u@\h \[\033[33m\w\033[0m\]
-$ '
 
 if [ -e ~/.bashrc ]; then
     . ~/.bashrc
@@ -133,6 +130,8 @@ esac
 
 
 . /git/contrib/completion/git-completion.bash
-PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
+PS1='\[\033]0;$MSYSTEM:\w\007
+\033[32m\]\u@\h \[\033[33m\w$(__git_ps1)\033[0m\]
+$ '
 
 export LESS=-FRSX