bzr push into mysql-trunk-wl5378 branch (marc.alff:3347 to 3348) WL#5378

[Marc Alff]

 3348 Marc Alff	2011-04-29
      Re branched tree for WL#5378

    modified:
      .bzr-mysql/default.conf
 3347 Davi Arnaut	2011-04-29 [merge]
      Merge of mysql-5.5 into mysql-trunk.

    modified:
      config.h.cmake
      configure.cmake
      vio/viosocket.c
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2011-04-29 13:01:39 +0000
+++ b/.bzr-mysql/default.conf	2011-04-30 00:14:44 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-trunk"
+tree_name = "mysql-trunk-wl5378"

No bundle (reason: useless for push emails).