# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@sun.com-20091027110955-b2t2op3hej9a8cf0
# target_branch: file:///Users/martinhansson/bzr/bug47925/5.1bt/
# testament_sha1: 5f97ee5d1ba8b08269be383d6d38f8b11427dcd7
# timestamp: 2009-10-27 12:10:00 +0100
# base_revision_id: joro@sun.com-20091026123303-5vizj39lx6z7276r
# 
# Begin bundle
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
KEh15eZ7AA==



