# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110330115226-vlbyawb3dy2dtl9a # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 1042cb01a260588ae60b9d961d4832776cb670b5 # timestamp: 2011-03-30 15:10:00 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110328090502-\ # 534eqcvryhj7ci91 # # Begin bundle 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 vqA=