# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100707031449-z9w4psrdtl705pg3
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-wl4895/
# testament_sha1: 573049c07c65f6c93c9765e1a95ce26f4c6d0333
# timestamp: 2010-07-06 21:15:17 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@oracle.com-20100702172526-\
#   13rst659fnwnfls0
# 
# Begin bundle
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


