# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100811170026-4zly1vhhbr47n43e
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   55873/
# testament_sha1: ec4e4b97191b725fb8528a713a9e93f8b4b77b40
# timestamp: 2010-08-11 11:00:37 -0600
# base_revision_id: jonathan.perkin@oracle.com-20100810140727-\
#   0g0ee595dxxqbkcz
# 
# Begin bundle
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
iJCg


