# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@oracle.com-20110512144157-\
#   aeslsfw4pcxeinje
# target_branch: file:///export/home/didrik/repo/trunk-test-utils/
# testament_sha1: 5f7cbb5ea20bc7bd57cd48adba1a017818262d16
# timestamp: 2011-05-12 16:42:02 +0200
# base_revision_id: tatjana.nuernberg@oracle.com-20110512141829-\
#   d356g1nkucpvaa6e
# 
# Begin bundle
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


