Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1

BitKeeper/triggers/post-commit

 #!/bin/sh
 
 #shift
-FROM=$USER@mysql.com
+if [ -n "$BK_USER" ]
+then
+  COMMITTER=$BK_USER
+else
+  COMMITTER=$USER
+fi
+FROM=$COMMITTER@mysql.com
 COMMITS=commits@lists.mysql.com
 DOCS=docs-commit@mysql.com
 LIMIT=10000
@@ -88,8 +94,8 @@ Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 X-CSetKey: <$CSETKEY>
 $BH
 Below is the list of changes that have just been committed into a local
-$VERSION repository of $USER. When $USER does a push these changes will
-be propagated to the main repository and, within 24 hours after the
+$VERSION repository of $COMMITTER.  When $COMMITTER does a push these changes
+will be propagated to the main repository and, within 24 hours after the
 push, to the public repository.
 For information on how to access the public repository
 see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html