# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511154617-4ipeglopbpdiwzy0 # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 23d05603534bd39e491bc31750ad045ab0c6f4b9 # timestamp: 2010-05-11 18:46:26 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100511154244-\ # 7p4t8o3y5n3lhqiz # # Begin bundle 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 XVA=