# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@mysql.com-20110507061613-2g5tm04hks7hqp8m
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: 1f814c2014fce22bfa23889cd68c4ce586e0b2c3
# timestamp: 2011-05-07 08:16:20 +0200
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: jonas@mysql.com-20110504130044-g92caf4ctmclxvnx
# 
# Begin bundle
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


