# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101104132028-0eumhlqu5ij2ok7q # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: f3353e69512b219d97f3ede0b2e0b04318da9e81 # timestamp: 2010-11-04 15:22:11 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101103125115-\ # xg1b5zsgyeatvgz2 # # Begin bundle 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 nChIZAp3ugA=