bzr commit into mysql-6.0-backup branch (jorgen.loland:2637) Bug#37394

[Jorgen Loland]

#At file:///localhome/jl208045/mysql/mysql-6.0-backup-review/

 2637 Jorgen Loland	2008-06-13 [merge]
      bug#37394 - Commit of local merge 
removed:
  .bzr-mysql.moved/
  .bzr-mysql.moved/default.conf
modified:
  .bzr-mysql/default.conf

=== removed directory '.bzr-mysql.moved'
=== removed file '.bzr-mysql.moved/default.conf'
--- a/.bzr-mysql.moved/default.conf	2008-06-03 11:31:06 +0000
+++ b/.bzr-mysql.moved/default.conf	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[MYSQL]
-post_commit_to = commits@stripped
-post_push_to = commits@stripped
-tree_name = mysql-6.0-backup

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-05-28 15:13:18 +0000
+++ b/.bzr-mysql/default.conf	2008-06-13 13:33:12 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
-post_commit_to = "commits@stripped"
-post_push_to = "commits@stripped"
-tree_name = "mysql-6.0"
+post_commit_to = commits@stripped
+post_push_to = commits@stripped
+tree_name = mysql-6.0-backup