# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@oracle.com-20110404084725-\
#   k8mehtjjg83uyueg
# target_branch: file:///export/home/didrik/repo/trunk-implicit-\
#   template/
# testament_sha1: 59f1e5da1d60885ac64de492801d864900e20ce0
# timestamp: 2011-04-04 10:47:31 +0200
# base_revision_id: vasil.dimov@oracle.com-20110404061715-\
#   3v7e8evt7o12ssu0
# 
# Begin bundle
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


