# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101116122146-f5ilp7xzdwl8t190 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 03987008e001cb033c3bcc82f9ae3b7d67e2ef82 # timestamp: 2010-11-16 14:22:00 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20101115070804-\ # gz1z4s7l3u4p48f5 # # Begin bundle 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 mg==