# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@oracle.com-20110113081952-\
#   n7mg2swpu1xb5fjp
# target_branch: file:///data0/martin/bzrroot/bug58165/t/
# testament_sha1: c50059ec63068969e42564d2da1802070b04075e
# timestamp: 2011-01-13 09:21:42 +0100
# source_branch: file:///data0/martin/bzrroot/bug58165/5.5/
# base_revision_id: olav.sandstaa@oracle.com-20110113073303-\
#   xtc6rhbo1g9iaiqm
# 
# Begin bundle
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
3G4eLPW5IPU/wLuSKcKEgaH/g4g=


