# 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 09:57:05 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101027065420-\ # zru5pvc6u8sbmrjg # # Begin bundle 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 BFPK0CvpWAv/Fvt/+LuSKcKEhPY3OpA=