# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@mysql.com-20091127114642-ldq7j7hikxtoz6l4
# target_branch: file:///home/jonas/src/telco-7.1/
# testament_sha1: f2c7b47253e4967ccbcb48069fcc861cf4d12f93
# timestamp: 2009-11-27 12:47:18 +0100
# source_branch: file:///home/jonas/src/71-local/
# base_revision_id: frazer@mysql.com-20091119095258-nl5rvjr6t027cne6
# 
# Begin bundle
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



