# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100827220011-8qy1pnnjqzzfhegp
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   merge/
# testament_sha1: e6cc176c3db85ac00c3c46ce7a4b54f5ad707f2e
# timestamp: 2010-08-27 16:01:12 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/
# base_revision_id: svoj@sun.com-20100827104810-adbau0o39cp1zc2w
# 
# Begin bundle
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
IpwoSHKyU0yA


