# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: charles.bell@sun.com-20091117153505-h6bemkg2kzl6z5kk
# target_branch: file:///Users/cbell/source/bzr/mysql-6.0-bug-48353/
# testament_sha1: 5143d3b4175905efa767b0f7f820ea33fef96508
# timestamp: 2009-11-17 10:35:21 -0500
# source_branch: file:///Users/cbell/source/bzr/mysql-6.0-backup/
# base_revision_id: charles.bell@sun.com-20091116152134-\
#   c8mmlu6xt668goxt
# 
# Begin bundle
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
a18eY4K+mjhO0BtDkcBv+LuSKcKEgGAKuKg=



