# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@oracle.com-20110401085125-\
#   vamfu2ow8yasxfnj
# target_branch: file:///export/home/didrik/repo/trunk-implicit-\
#   template/
# testament_sha1: da36143c8178cd004d13c5798569d849a5e42267
# timestamp: 2011-04-01 10:51:31 +0200
# base_revision_id: mattias.jonsson@oracle.com-20110331143551-\
#   q8lg4fcceeof0yrl
# 
# Begin bundle
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


