# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@oracle.com-20101208032430-1igi3mu7hk25gymb
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/
# testament_sha1: 0e50d08b229f2c444da9771f239b2d043929a7b4
# timestamp: 2010-12-07 21:24:38 -0600
# base_revision_id: chris.powers@oracle.com-20101207195008-\
#   tsk6161qu1ndwldv
# 
# Begin bundle
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
KKKZKpaX9jZ/8XckU4UJDAClRfA=


