# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@oracle.com-20110314162927-qs4b586w8sr422vi
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/
# testament_sha1: 0f4177a68a5fed221ecf7a443ecbecef5ef7a213
# timestamp: 2011-03-14 11:29:31 -0500
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: cpowers@tma-1-20110314161125-mtq698j2ey3czfcb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWezfLwQAAalfgAAQWHf//3ol
yoC////wUAPae954u3tWzD1zBppEJk0egJMm1G1NMNBHqZNGjamgDKmkzRiDJNDUYATCMATTCYBK
EApjKYjSeqZqB6jTCAGQMgCSST0p7UyajTxGpk9QPKA9IyaGIaAEkkNNKbAmamhT1PTxU9TQfqgG
jJoHqDbteCL3/I03LXM2KOrueIR4O0e6MHNBrKqu9zqL+h2PnkJIHOQB9t6pWlSKi55Y2G7LDaRd
x8NmRnP9pN6mEtIZiUe1tUt1NOOfYi31QWqleV0gaNRDJ83SNIw4XSIQpjKjRZr8aCqn5Pl3ecCk
NAKA21bH2yrsZEGj0lUrCGe6JOEZM1g0affYuBYG6JUrg+w6uuMRWT48IIlOgrghgSaEXYH5lwna
sJLiA/eXNIogSKQqh1uv3MrRGJ6QoU9jVdb8FbZyCxRcUmAGqI3kgIfBeEcQS0nGUg8UnMR0YsFw
hraPOQqKOSPRjU7fKkfHOdEwVAuMhIOa2L+KSe4+L5Zr5DkJGjQqmUHejIayY377GRQssUCzFEwe
43qUK667F5s5EFIJMaZVHhZSjuWwmQLieYDNEFIBlc10agkMYVVSC5TRMIROh14oW1FMCp5njsmV
C6ideFQoNvnHKO5PpLtrFOwxpjMXRoVJKl2Cy0YdJyLJYFAhNew6NvWdVrvZzDlx8ttaIIooACPm
plz30n2vK5eBwmBCId6YJZ8BIEyN4NNaxyiOcqA3EcmTQDPIz/39DvoAuFd2XShVtssa7dfQNER2
u2TaQjB2Ms0vKLCYwN6QaAkD4gvQlMon4NHn0p7jQZ36un8knAfYCahlsOanf2ljsY9s2pO4wM0i
ivSaT4ycw/bw94hWfOKrfWi+rzX5HJtkQ5IcsI4ViXMbWnVpxYnQmnoowuHFCiw0yX03d3EBJnYx
7j8IfQpgAiRRyR+ScUVVi1mdGdsNCdaxMLNGvJQo1ihJXiBnsBt4M9uN64IkA65FaGONDnjluC0r
9fj800IaGKcRiFffjGS0PJWgUg2cuuKtWODAX23JwRXtX03hSu5qpA57AGOeHwfyAnrWAT40EZ5Z
SrBa+6M1EAkgSBJBOkhXNUapk9ky53pWccEEwdHSl/UBgkC1ym0RJHKmWWmpmX7EXvkG7QJ0wVSQ
1mtp1co/XgLLh5trh4mC4FpyQ9FmdpOYvQQCySPJPQSEEVMXgWEe5EItWV9x2sY3zC4GodisSUNe
kS7pWdwdf5Z5vXiY3DqQVv8KJBn1yOqe1UhpvwL1apkOWdM4yxR4FRm0Kt5c0JxQgvIVQUahYwXD
Y5PUrDDKD8jqeMrUf+LuSKcKEh2b5eCA