# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20101221120026-\ # 0jj8yve2f4japdn9 # target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug58137/ # testament_sha1: adc0a97deb69f65d62fb552dacbd5ba0cdfec1ee # timestamp: 2010-12-21 13:49:35 +0100 # base_revision_id: sven.sandberg@oracle.com-20101221121422-\ # xwgkb365b2b5pdok # # Begin bundle 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 4/8XckU4UJDrlehQ