# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100602113733-fslfv73nhi0d17t4
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 12b11fe9da6b0f01b931fe90a4d15ada1a6238da
# timestamp: 2010-06-02 14:37:40 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@oracle.com-20100602113441-\
#   96fny74sm5os2l2s
# 
# Begin bundle
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


