# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100624110652-9kpk0k6kgvdim6l6
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 13897b022d5628fa7b25eb9b3f2a2611b92f5a32
# timestamp: 2010-06-24 14:07:02 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@oracle.com-20100624072140-\
#   zp22g2u908nifuwi
# 
# Begin bundle
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
u5IpwoSAa5piaA==


