# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110531081827-mkqxrlx0ilddhc7m # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: a33f4951e30e75d8be0dfc3e727bb0b09ca75414 # timestamp: 2011-05-31 11:19:48 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: davi.arnaut@oracle.com-20110530151912-\ # vjbq0n6ojdc752ru # # Begin bundle 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