# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@oracle.com-20110401142023-\
#   obsafv86a2qjlmtp
# target_branch: file:///export/home/didrik/repo/trunk-implicit-\
#   template/
# testament_sha1: bf4a6772e0ff9acc5e34eb680e0df7f6e131443a
# timestamp: 2011-04-01 16:20:28 +0200
# base_revision_id: jorgen.loland@oracle.com-20110401140452-\
#   dc3lfm7m6ii3auna
# 
# Begin bundle
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


