# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@oracle.com-20110621131037-\ # hr0vnnxhqduwsr07 # target_branch: file:///data0/magnus/mysql/7.0-bug12352191/ # testament_sha1: 65006757fb5c9a1a4a7484e90ec68299784c805f # timestamp: 2011-06-21 15:12:16 +0200 # base_revision_id: ole.john.aske@oracle.com-20110620132548-\ # 23uh12xi5czgoc5z # # Begin bundle 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