# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@oracle.com-20101130172056-9jatyx37k8btisq8
# target_branch: file:///home/cpowers/work/dev/mysql-5.5-bugteam/
# testament_sha1: 51e114804c8ab7d40db09dd9296c118705e82ed7
# timestamp: 2010-11-30 11:21:28 -0600
# base_revision_id: georgi.kodinov@oracle.com-20101129154026-\
#   79xf3b8exzq0ebzk
# 
# Begin bundle
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
v+LuSKcKEgz62yKA


