# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125103535-yrom0ik8nvn80edz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 7181fc699e9ecfc5c94e09a219d6b149a8ab065a # timestamp: 2011-01-25 12:36:58 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110125085113-\ # 5ilepn2yqhqkcsx5 # # Begin bundle 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 Mv+LuSKcKEghgDBiAA==