# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@oracle.com-20110113080721-\
#   bu92czxpaw9nht9k
# target_branch: file:///data0/martin/bzrroot/bug58165/5.5/
# testament_sha1: 6d4476a02021cd87d46c44af99ce5e28afcce08e
# timestamp: 2011-01-13 09:22:05 +0100
# source_branch: file:///data0/martin/bzrroot/bug58165/5.1/
# base_revision_id: bjorn.munch@oracle.com-20110112225418-\
#   3zw6jvo3jywfqsva
# 
# Begin bundle
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
3D9i7g==


