# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@oracle.com-20100804154750-qx0wf5c5shvyowdc
# target_branch: file:///home/cpowers/work/dev/dev-wl4896/mysql/
# testament_sha1: acbd3b91612b56dc47bbe2c9d37c3f82f6f098ca
# timestamp: 2010-08-04 10:48:06 -0500
# base_revision_id: chris.powers@oracle.com-20100804031948-\
#   41kqkh4099z7kh3p
# 
# Begin bundle
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
P83iIpf/F3JFOFCQlQL8eA==


