# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110125124138-\ # ohbhmwrgead73bba # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: 899f761bae25a5e1ac6c0e0860a3088892e52cd9 # timestamp: 2011-01-25 13:41:43 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: georgi.kodinov@oracle.com-20110124154716-\ # 9ca9rjaw3smuu1kh # # Begin bundle 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