bzr push into mysql-6.0-backup branch (oystein.grovlen:2681 to 2682)

[Oystein Grovlen]

 2682 Oystein Grovlen	2008-09-09 [merge]
      Merge from mysql-6.0 to mysql-6.0-backup-merge
modified:
  configure.in

 2681 Oystein Grovlen	2008-09-04
      Do not propagate tree_name to main.
modified:
  .bzr-mysql/default.conf

=== modified file 'configure.in'

=== modified file 'configure.in'
--- a/configure.in	2008-08-28 08:44:13 +0000
+++ b/configure.in	2008-09-05 15:30:40 +0000
@@ -9,7 +9,7 @@
 # remember to also update version.c in ndb
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 6.0.7-alpha)
+AM_INIT_AUTOMAKE(mysql, 6.0.8-alpha)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 NDB_VERSION_MAJOR=6