# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@sun.com-20091027140459-gvt0x5um07jiln13
# target_branch: file:///Users/martinhansson/bzr/bug47925/5.1bt/
# testament_sha1: 0f20dbd22d0aa5c547cdcd70d8afc0fa9a0e1283
# timestamp: 2009-10-27 15:05:04 +0100
# base_revision_id: joro@sun.com-20091026123303-5vizj39lx6z7276r
# 
# Begin bundle
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
AdNZDlocNms2cr2uf+6UKf/F3JFOFCQ3rfVYwA==



