# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@oracle.com-20110204220044-fdlu52exl5rhbm10
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/
# testament_sha1: 635fcb9b7cef9469ae76b6b99c8c5ea62cca8ac8
# timestamp: 2011-02-04 16:00:51 -0600
# base_revision_id: chris.powers@oracle.com-20110126230225-\
#   htfatb79ldpj5gjk
# 
# Begin bundle
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


