# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@sun.com-20091110125246-wom2bbxt5koahstl
# target_branch: file:///data0/martin/bzr/bug33204/n-mr-bf/
# testament_sha1: 9e5a2c9e96126d23ee49cbb9ada61c8f5746453e
# timestamp: 2009-11-10 13:52:51 +0100
# base_revision_id: bar@mysql.com-20091109113518-4nz701wqpo9it753
# 
# Begin bundle
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
1p1ofiPWSP9HuaoIKEEiI9H/i7kinChIStsANgA=



