Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BitKeeper/triggers/post-commit:
  Auto merged

BitKeeper/triggers/post-commit

@@ -96,7 +96,7 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
 
 EOF
   bk changes -v -r+
-  bk cset -r+ -d
+  bk rset -r+ -ah | bk gnupatch -h -dup -T
  ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt
 
 $SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt
@@ -118,7 +118,7 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
 
 EOF
   bk changes -v -r+
-  bk cset -r+ -d
+  bk rset -r+ -ah | bk gnupatch -h -dup -T
  ) > $BKROOT/BitKeeper/tmp/docs.txt
  $SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt
  fi