bzr push into mysql-trunk branch (marc.alff:3349 to 3350)

[Marc Alff]

 3350 Marc Alff	2011-04-30
      Fixed tree name

    modified:
      .bzr-mysql/default.conf
 3349 Nirbhay Choubey	2011-04-30 [merge]
      Merge of fix for bug#11757855 from mysql-5.5 -> mysql-trunk.

    modified:
      cmake/os/WindowsCache.cmake
      cmd-line-utils/libedit/el.c
      config.h.cmake
      configure.cmake
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2011-04-30 00:14:44 +0000
+++ b/.bzr-mysql/default.conf	2011-04-30 16:35:16 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-trunk-wl5378"
+tree_name = "mysql-trunk"

No bundle (reason: useless for push emails).