# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@mysql.com-20110507061702-98gqjmtfm11id0i3
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: e0628c2eec39e3dd79df7064739afaabc1c9ddb4
# timestamp: 2011-05-07 08:17:07 +0200
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: magnus.blaudd@oracle.com-20110506180143-\
#   xyjratel4w459frq
# 
# Begin bundle
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
sDgDzJCyVbUGNqEcJeUF4w/8XckU4UJAAngwGA==


