# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kostja@sun.com-20091211121337-4po257u415iy5oyw # target_branch: file:///opt/local/work/next-4284/ # testament_sha1: c67a112883ce4879a2507388afccfc3f2d64d1ad # timestamp: 2009-12-11 15:13:51 +0300 # source_branch: file:///home/kostja/work/6.0-codebase/ # base_revision_id: kostja@sun.com-20091211111859-lse5qbt8k1ar9q2p # # Begin bundle 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