# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125085113-5ilepn2yqhqkcsx5 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 87ce785ad7c478f1f3740191081bf97d557cf30a # timestamp: 2011-01-25 10:53:00 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20110125072536-\ # px4emoj4edj6a17i # # Begin bundle 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 FOFCQGkRApg=