# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100716144304-2s9nd5f3fnmm4906
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   cleanup/
# testament_sha1: ef93f9c6acb2e7ac5065d8c4e982eb5bbfa91d62
# timestamp: 2010-07-16 08:44:22 -0600
# base_revision_id: marc.alff@oracle.com-20100716012503-\
#   pvjmx5781nvhr3vb
# 
# Begin bundle
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


