# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090618135246-\
#   r4wmu1uno1qer0io
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-43929/mysql-5.1-bugteam/
# testament_sha1: 29b96ebade4f752233e4e623a181f124fd26f0b0
# timestamp: 2009-06-18 14:53:30 +0100
# base_revision_id: joro@sun.com-20090616095957-x865jcqrqmne7wlu
# 
# Begin bundle
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
RrKxv/i7kinChIGFh+HQ



