# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20110204115517-g5s19vcuomiop1as
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/
# testament_sha1: 3aa1dfd60e9f831dbdf872a0a0cbbc8279cf3216
# timestamp: 2011-02-04 12:55:46 +0100
# base_revision_id: marc.alff@oracle.com-20110202115259-\
#   p5azio9gpjr5oig6
# 
# Begin bundle
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


