# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@oracle.com-20100930110650-\
#   mweq8vd6xd65hivi
# target_branch: file:///home/kgeorge/mysql/work/B53296-5.5-bugteam/
# testament_sha1: ac73d479575c83dbeebdf08efdf589b9f11c8caf
# timestamp: 2010-09-30 14:23:55 +0300
# source_branch: file:///home/kgeorge/mysql/work/B53296-5.5-merge/
# base_revision_id: georgi.kodinov@oracle.com-20100929152240-\
#   clxxkcpt7t57l7hi
# 
# Begin bundle
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
ObvOYxP5JH/Qu5IpwoSGO3u7UA==


