# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kostja@sun.com-20091120201257-yy7t8dgotsotg0so
# target_branch: file:///opt/local/work/next-mr-kostja/
# testament_sha1: c550ae278ec8b51deeec323236b5980da75ed98c
# timestamp: 2009-11-20 23:13:13 +0300
# source_branch: file:///home/kostja/work/6.0-codebase/
# base_revision_id: kostja@sun.com-20091120191550-o212devfco01602d
# 
# Begin bundle
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
rMEsdZMWFDiQ5uI4f5Ef3F3JFOFCQ8NjmEg=



