# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110405073758-b8y733yvkqum940i # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: bc0da7575abe9b28098684e6212297d5e270f159 # timestamp: 2011-04-05 10:38:08 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110405071843-\ # dr6mbq0wokqdxl9m # # Begin bundle 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 0BGqII7ZIB/xh7//F3JFOFCQXy/s3w==