# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100826212123-rukguhq3ktsedk4v
# target_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing-\
#   52312/
# testament_sha1: 7124f2a1e7d6bb5449ac64431197904ce63fc8ee
# timestamp: 2010-08-26 15:22:16 -0600
# base_revision_id: chris.powers@oracle.com-20100826154525-\
#   zb7xchdw4adbtt0x
# 
# Begin bundle
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
U4UJDzMXHJA=


