# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100601140355-u3kxl0yl0ljl5tx9 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: e64b568691e5d7cba3f63b16b53081d43059d442 # timestamp: 2010-06-01 17:04:03 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: alik@sun.com-20100601123801-y9qv7igo16nw0umn # # Begin bundle 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 gpBjAkg9lFwU96/y9viEjgP+LuSKcKEgeTMiJA==