# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100624104620-pklunowaigv7quu9 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 60dc3ca7e4d581a33cf506500ccb94e90be28978 # timestamp: 2010-06-24 13:46:32 +0300 # base_revision_id: jimmy.yang@oracle.com-20100624021010-\ # oh2hnp8e1xbaax6u # # Begin bundle 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 oSCbAGo+