# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: charles.bell@sun.com-20091104142350-ogz3z3983yq36glo
# target_branch: file:///Users/cbell/source/bzr/mysql-6.0-bug-47804/
# testament_sha1: 4ea0dadedb3fdd6ef2b5b5721f296d85511682a8
# timestamp: 2009-11-04 09:49:46 -0500
# source_branch: file:///Users/cbell/source/bzr/mysql-6.0-backup/
# base_revision_id: rafal.somla@sun.com-20091102140519-\
#   nywm403dksch0u6u
# 
# Begin bundle
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
+Qu5IpwoSDFz4KMA



