# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magne.mahre@sun.com-20100505212858-ksrf3k35e6ovfg3t # target_branch: file:///data/z/mysql-trunk-runtime/ # testament_sha1: 18ca3fa5c8a62e4fb39fd47b69ef41dab3163fcd # timestamp: 2010-05-05 23:29:06 +0200 # base_revision_id: magne.mahre@sun.com-20100505101707-\ # hbuahi9sq2zgobai # # Begin bundle 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