bzr push into mysql-6.0 branch (alik:2699 to 2700)

[Alexander Nozdrin]

 2700 Alexander Nozdrin	2008-11-05
      Reverting default.conf
modified:
  .bzr-mysql/default.conf

 2699 Sergey Petrunia	2008-11-01 [merge]
      mysql-6.0 -> mysql-6.0-opt merge
modified:
  .bzrignore
  BUILD/compile-dist
  configure.in
  zlib/gzio.c

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-11-01 17:24:56 +0000
+++ b/.bzr-mysql/default.conf	2008-11-05 11:52:43 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-opt
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
 post_commit_to = commits@stripped
 post_push_to = commits@stripped
-tree_name = mysql-6.0-opt
+tree_name = mysql-6.0