# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20110406115655-i0e8qdd8zx9l7gni # target_branch: file:///home/rl136806/mysql/repo/mysql-work5/ # testament_sha1: 5e7c478a080a79956eec68410ca3947ac3fadd37 # timestamp: 2011-04-06 13:57:46 +0200 # base_revision_id: tor.didriksen@oracle.com-20110401110648-\ # cgdn0ukb1q3jqn1z # # Begin bundle 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 gZ9ygcMJ/4u5IpwoSAOjTIYA