# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: staale.smedseng@sun.com-20091002093337-8nkzufcvfxnrlrw5
# target_branch: file:///export/home/tmp/ss156133/z/43414-pe/
# testament_sha1: 7c8e93d49f6ebc42cc33dfa31e30aeff3d4a3a1b
# timestamp: 2009-10-02 11:33:50 +0200
# source_branch: file:///export/home/tmp/ss156133/z/43414-51/
# base_revision_id: joerg@mysql.com-20091001205003-3sfzy65ftyxr06fy
# 
# Begin bundle
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



