# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101103092514-w73qo0gcguyo592i # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 2b00a9cc5e0edf6c10d674420397fefda3e0071b # timestamp: 2010-11-03 11:27:01 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20101103031444-\ # pfbpy1f45mg0gz58 # # Begin bundle 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 eTEg