# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110118114903-\ # t8faxnys8vam34y3 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0/ # testament_sha1: 0e5562d0d48aed4850755eb995ca463b2bf9a13f # timestamp: 2011-01-18 12:49:09 +0100 # base_revision_id: jonas@mysql.com-20110118095249-tmo9ia9ktfek5340 # # Begin bundle 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 c4fA