# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110217113807-\ # 9qm11wd7g2gvv1a4 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: f23ff84730661daf871ff7c10b449337e44b99cd # timestamp: 2011-02-17 12:38:13 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: tor.didriksen@oracle.com-20110217073605-\ # gdb0nmlxrl92jg8m # # Begin bundle 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 f15+H/4u5IpwoSGP4C4k