# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@oracle.com-20110202115449-\
#   lb299za67piiyw2l
# target_branch: file:///export/home/didrik/repo/5.5-sortaborted/
# testament_sha1: 1c958cb51ccae2aae4487d8bac614f29a2c4720c
# timestamp: 2011-02-02 12:54:53 +0100
# base_revision_id: tor.didriksen@oracle.com-20110202091844-\
#   kt1gsyymbonb8fwi
# 
# Begin bundle
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


