bzr push into mysql-6.0 branch (hakan:2726 to 2727)

[Hakan Kuecuekyilmaz]

 2727 Hakan Kuecuekyilmaz	2008-07-02
      After merge fix.
modified:
  .bzr-mysql/default.conf

 2726 Hakan Kuecuekyilmaz	2008-07-02 [merge]
      Merge something bzr forces me to do so.

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-06-30 20:21:41 +0000
+++ b/.bzr-mysql/default.conf	2008-07-02 20:30:16 +0000
@@ -1,6 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0/
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-post_commit_url = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/
-tree_name = mysql-6.0-falcon
+tree_name = mysql-6.0