# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: cpowers@tma-1-20110402210806-ub1qi3clj36p3mmr # target_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\ # wl4896/ # testament_sha1: 3986c9466ffc3d938ef548e82c3f62263f58163c # timestamp: 2011-04-02 16:09:15 -0500 # source_branch: bzr+ssh://cpowers@bk-internal.mysql.com/bzrroot\ # /server/mysql-trunk/ # base_revision_id: cpowers@tma-1-20110401230138-mwrloxpyb11257ou # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXzPR0YAAnPfgFAQWXf//38v zIC////wUATu7W80HjeaKd6I57CUQJNpJ5U9kp7TTNUn6KHpppA9R6Q0MnpqBoJRATIxCmKaN6oP SHpDE2kwgyAADIhMRopvVPUyD1NPSGQABoAGgAJFRiCYhPJT00j1HiekgHpPUAMjJkGgkkNQFMei k/TTQaSaHqGmgZAAAB8naoebPJK3pHvvu5GTC65VI/SLUlLTJ6JOoDBzX5eiFFkKYTXqYU3js/3f I8R9DSNNob7cesVEah8jbLHPcqpNER4wPYJ/tVLLaPqjKLPHDmyI3zvVrr8TDouriiN91W85Mk6G WiYfoYjaaXwHhky0rHuv1Ld0ksZZjlg/Og6thRAe/kbPYohnwz3w4SGzdmFt5By9S42gQIKEOqB1 pyzLZr15aAMHzOFKa2l4ZKrzSb4oW9l7zTCha0gYVwR5KSTQUQGXFgUuNxCoB2qlKoakDm6RPEsB lb6LSyUkFfTykb4IXGkVdSKEKoCZkLLpiJIGgxLqIguaEKlLYwtlnK0Gu8C9gPzXNliUyEO3nuXR u2xNA/kFvLdoZb4gaCw55RrSC0WTzTIOTSIgMHAnYK+x09uJtdQI1UI2G40jFWO62Kwmq5mkthhJ StGh+AKSio63UyzOmw2AM5dArOAFk4z1w0Wi0goBDOJQMSzRqgKWjtfsqoMlddrzxtvyrbLYR59H DAzcwoUHGkYXClrx1XsSrcBmvJDmkRFwoYjKmoNmIPWWBWhYDcI+y3OFmUIuSCZ0pQGPzm+ZI87k rnhUIMmitQG4uKUhkpdBMb2kSiwK0H54VEk9jouGl5tnAlY2UoXQJklrplRUpfXB7AZRR+BSyDAE gjjEh0UbzmzhPBy7uvb0Ku4sGipPh2EJUCJ+Oc9IqKqs+3Cjwh4NxXl38+fi9XssXnSzxqZvujHt /V76xVRFS3uYGC9azIiOE2+XufxiTkeNC+J2FEk6kM/bgiPeQWmm9KnP/AGbzl5+0U32YLpmNyIf E9igqHGJlw4Dy8d9RK77s8zcN3TY3QgbdIGGi1TIz9qhwN6KM9OtUKuAkp8tUoBNAJZx2rDIh53n ElfRpIRJ/UltEJqrOUj0dQ5psxhUVjao2lY0eWT7TymPDZRlh1kGcmSlvfIv3T8Smvg3a113cVLp Lp+GGJWCf4FDsKnWtf8MdOzWeSIjtg+Iq9sUJU71QqIITa8LhmwkaxS24jjNBFMybd51Fp/JsbHH XcDVGObuE10fWOyZmKHZZIiKTY94UwMXc/wDaTV3OCG6nyWApi82I4U3Rjo1YRjmRLJvRlMUnufh npGgYuXhGYRND7sdgVIteLMn18K6uIu7KgcDrw8EORq1sZrVeem7JCZwv0qvbebMeQD0UJwOhQpp Z4IoNUS10nYpuIMRKWg4MykwSgsuaerTheKhE43WQsF1RJRJnUjIH1n59UVnxVigkrld6QLNLGE6 xqZxbcaSpJcunjXVRxXSBortJV806bGE6NuGiEZJdNu65SDzYqwNU91hCSbEm3FryQ1uMtYcm6Il VPCii4NuBW+CDTwCTDk44j1/2fXsqlhYrYST26ZMsMfkw1CRg8UXQGE4GqkYeO67gzVUNtWKJhLh bhkVf8EDBhEgJvUCAYAMVJbqQGSDhGc4FqkISX/ANW0XE5xbMtKgjC17Zl5VXPhSFF1Yv+LuSKcK Eg+Z6OjA