# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100915204626-k78so974pjkpinux
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: 25254d1f832ec0528f5105c318a39fe6826c0c86
# timestamp: 2010-09-15 14:47:18 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: olav.sandstaa@oracle.com-20100915115129-\
#   6jwundfyb0o9ouxm
# 
# Begin bundle
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
B0lx/xdyRThQkM+uFGw=


