# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@oracle.com-20101130031005-rqwbg5blzr7fo6xf
# target_branch: file:///home/cpowers/work/dev/mysql-5.0-bugteam/
# testament_sha1: f7d1f8318a228e04b6eb906a8af744789a9bcfed
# timestamp: 2010-11-29 21:10:20 -0600
# base_revision_id: chris.powers@oracle.com-20101130005146-\
#   47t2izsgx5xbgy23
# 
# Begin bundle
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


