# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100413143009-xay3250b7hlh0jvv
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   45355/
# testament_sha1: 32b7b7f8be23897f9e9bca156b750000ab4f23d9
# timestamp: 2010-04-13 08:30:16 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/
# base_revision_id: marc.alff@oracle.com-20100413142310-\
#   lzrklxyp6jpgfjhi
# 
# Begin bundle
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


