# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kostja@sun.com-20091123165731-nh7oss40x0gaciw7 # target_branch: file:///opt/local/work/next-mr-kostja/ # testament_sha1: b45189d075b403617fababf2401fd2080f34df67 # timestamp: 2009-11-23 20:03:07 +0300 # source_branch: file:///home/kostja/work/6.0-codebase/ # base_revision_id: kostja@sun.com-20091123130939-n7cqss2w720b8mr3 # # Begin bundle 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