# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20101221152152-\ # 0gxsh5xg56jnxk3w # target_branch: file:///export/home/didrik/repo/next-mr-gtest/ # testament_sha1: e779b0406d190144cb7c4ce2ddd5e448e5917d11 # timestamp: 2010-12-21 16:22:02 +0100 # source_branch: file:///export/home/didrik/repo/next-mr-bugfixing/ # base_revision_id: tor.didriksen@oracle.com-20101220171814-\ # grwzzombinx9y0a0 # # Begin bundle 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