# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@oracle.com-20100930105539-pr97jc4hfgpb0l7k
# target_branch: file:///home/bm136801/my/mtr-tr/
# testament_sha1: 7fc7361e24c6ec902b964f52f87738ed117db1db
# timestamp: 2010-09-30 12:56:23 +0200
# source_branch: file:///home/bm136801/my/mysql-trunk/
# base_revision_id: bjorn.munch@oracle.com-20100929111728-\
#   8qvsupp6wo0gv4od
# 
# Begin bundle
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
//F3JFOFCQ7I5Tpw


