# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20110303142541-\ # wdomckpmfo3evs52 # target_branch: file:///export/home/didrik/repo/5.5/ # testament_sha1: d1d5961cfb9360d9657bcd1aa51ca4b905f61ebc # timestamp: 2011-03-03 15:25:44 +0100 # source_branch: file:///export/home/didrik/repo/trunk/ # base_revision_id: alexander.barkov@oracle.com-20110303122736-\ # kzo1k4uqpw01m2ud # # Begin bundle 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