# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100519080152-h3555oqmu3wo95so # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: befda87d4ca32c0900af6ea66bfed9da043d873d # timestamp: 2010-05-19 11:02:01 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100519075843-\ # 4gl3uijo6cwjtcf9 # # Begin bundle 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 /8XckU4UJBaRWP+A