# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110209100102-\ # war5d5h2ftu3v03e # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: 2e1c4811eeef32fe3e0bd010dfc416e045459f46 # timestamp: 2011-02-09 11:01:08 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: georgi.kodinov@oracle.com-20110209073117-\ # vtp229shgu2phapt # # Begin bundle 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