# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@sun.com-20100604150303-6gpcywf0de1v10b0 # target_branch: file:///home/rl136806/mysql/repo/mysql-work4/ # testament_sha1: 75a2babfd776560a20b5f1a73e54585c7f28eaa5 # timestamp: 2010-06-04 17:04:08 +0200 # base_revision_id: olav@sun.com-20100527125548-8epbdowjxdl2bm3r # # Begin bundle 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 kKvG6tw=