# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101116123953-62bzmuuymztjajwa # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 78391af81811c0d2e138e821234c645a8434fcaf # timestamp: 2010-11-16 14:40:02 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101116122146-\ # f5ilp7xzdwl8t190 # # Begin bundle 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