# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100827215159-wgoh13bi5fecden6
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: a48e5f58b53ff40785a880f90b1a3daae6bccc41
# timestamp: 2010-08-27 15:53:02 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: svoj@sun.com-20100827072008-g1fdvfp4asq94k38
# 
# Begin bundle
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


