# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@mysql.com-20110609082013-5zmmzk41inqav0pp
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: 03ef4b079db5f8b36b1164f1dfb214f515f3937a
# timestamp: 2011-06-09 10:20:25 +0200
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: jonas@mysql.com-20110609073705-kjydl5s8fjnbeevf
# 
# Begin bundle
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
I5hIr2lIXIKy6eZDXaMggiH/Iu5IpwoSCyGj/EA=


