bzr commit into mysql-6.0-maria branch (alik:2706)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/6.0-maria/

 2706 Alexander Nozdrin	2008-12-15 [merge]
      Fix default.conf
modified:
  .bzr-mysql/default.conf

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-12-14 11:36:15 +0000
+++ b/.bzr-mysql/default.conf	2008-12-15 09:42:08 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-maria
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-6.0-bka-preview"
+tree_name = "mysql-6.0-maria"