From: Marc Alff
Date: April 30 2011 12:14am
Subject: bzr commit into mysql-trunk-wl5378 branch (marc.alff:3348) WL#5378
List-Archive: http://lists.mysql.com/commits/136452
Message-Id: <201104300015.p3U0F3UK004590@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4257230101145989316=="

--===============4257230101145989316==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-trunk-wl5378/ based on revid:davi.arnaut@stripped

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

    modified:
      .bzr-mysql/default.conf
=== 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"


--===============4257230101145989316==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-wl5378/
# testament_sha1: 10d458790ac6774c0880f78e4f521d1344a8386b
# timestamp: 2011-04-29 18:14:50 -0600
# base_revision_id: davi.arnaut@stripped\
#   a45s45pi0p2lf945
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXrXKVoAAWPfgAAQWGP/93IG
EIC////wUAM9edHtY5AIZFCY0I00G1DJoA0DRoADSaIMBR6TQAAAAAAaKPU2qfpQ0PUNGhoGjQAA
AU0hoJg0BMBBgAAEYSSExAIwmJqDUeFR6jRkZPU9BDPCxXoE62YSaxSDGAgacOOKXyC07oAGNo9j
ywAQgWGS1U2fecjyEK2WZkkcT18qhGTckPs2sHcEYmnM1rQZjbpWamUdkrFkkVKvB7qnPRybcVQu
xrwWDCJRiBhs58BGiZ6lxT19nlNELlxV94uvl4kIhocJ1CKySoyguZskScrqXAGC8NY0mIq+7pFh
0UBIfUoq2NrQmlMhOmnrBQc+uTqNTisqQr2qmFHTJXTFQTpmrGUM8aLLd87CwUKVKlxo8RQJ4pme
C905WKm+gleDYm1s4RlZcxaOVwc5Ln7Mh4+S6iYXoyfh8jG11LE6UIFDgkBMoxCBPjJQbArEH3CQ
WpDQpYMGQPUwLWPwJbnNAneThZeI0wEDW9oNRpocZRmQc8UhSxkam4OAkU9gnFN1rcR0nPxqqrFM
RPauZGOsXjKJFS1kdKoDBl3WkePPzgefbskefCmiJ0vkHdLxgYQI/7slciactlNYLrb6YLLpgOKM
fBXmc/X0WYGZLqcxWEGL2Pj3zN2i5kjVIvZcR93lH0JqJQov7kVlUsdaNgpD/XUKvVcroUkIja80
8bXJhciY5sRWQgLPHRoXQKq9Suv3kd2GmIUo5aohHEoYi9hwaaKJxAA8VnunXlGQwSvT8E8gBUff
r4qZdjf2rQ5YBYih7tl0qV+qzWRmX3e6aGp5C5J5j9Qt/HLJ+YariHN7+f+C4C3FzyGyCC+FqH5K
wreFM0hj2Xx6paJsP3Cn+Ej6H0G019VSPtNZwgdF/UqofyKmdDLX1eqr2iEQbaByQ9ky6S0BPDw5
PIfCRoDl+cXqzL9lwxZk8h3V6nwjFealjLBMPSXzIAWjIn5WkuU1m0lOF0aIDLuuCfdRZoxTeDRX
jspEUW9uidmn+5a1WJKXHeosVIVKebuJJy48P73tW0it60W4qk9ZhOwv3gqhPFWrAGAqDCoNcogp
/i7kinChIPWuUrQ=


--===============4257230101145989316==--