# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20110202091844-\ # kt1gsyymbonb8fwi # target_branch: file:///export/home/didrik/repo/5.5/ # testament_sha1: 844390b8e49d3b19b2eeb696c2cd2d15c7d0b43b # timestamp: 2011-02-02 10:18:47 +0100 # source_branch: file:///export/home/didrik/repo/trunk/ # base_revision_id: ole.john.aske@oracle.com-20110201141934-\ # ppx2z4tn6vv0u8q9 # # Begin bundle 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