# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100809085837-s1nfx6gjf7l6ttab
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: b48147d9335c25064f7375b6455e55a5103ac7a2
# timestamp: 2010-08-09 11:58:47 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: inaam.rana@oracle.com-20100805154211-\
#   fa9g6qagqzbkpfbk
# 
# Begin bundle
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
akf4cv0/8XckU4UJBc5V4MA=


