# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101027065656-gru5r7k3qqyu64l9 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: dfd8cebac210f00531eecb360ad1d4ed5cc4459f # timestamp: 2010-10-27 10:07:08 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: inaam.rana@oracle.com-20101027014558-\ # ax7egimco5r8zp42 # # Begin bundle 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 QtS6CHn9X1DQch9hdyRThQkJvsdfUA==