# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20101119123444-\ # p744i9hd2jyfrpfq # target_branch: file:///export/home/didrik/repo/trunk-bugfixing/ # testament_sha1: fccbc3f2f55de8a9a882ff0964aec7ef11089f4f # timestamp: 2010-11-19 13:35:00 +0100 # source_branch: file:///export/home/didrik/repo/5.5-bugteam-bug58137/ # base_revision_id: bjorn.munch@oracle.com-20101119113711-\ # 8vlexlbxp1kan7pf # # Begin bundle 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 WdhFKurcI/8XckU4UJCD4L9Z