# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101130140910-o3myzg74fy85hjzc # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 3cf9fb2f252a8ad2d3bb81e291dfa409e8cb0157 # timestamp: 2010-11-30 16:09:24 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20101130055140-\ # 52jzzp06vpp49ny2 # # Begin bundle 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 P/F3JFOFCQP24MsA