# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100826212602-bbknhiu5jru2mbh2
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: 72b54ba3e6bd63f68a2002edc36cad27bee8819d
# timestamp: 2010-08-26 15:26:51 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: chris.powers@oracle.com-20100826164402-\
#   qpuv0lhdtvgr5ax6
# 
# Begin bundle
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


