# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@oracle.com-20101125090354-b3lesk38qgv8xvha
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: 5de198649ec558c97d109c9c2832188f209d2329
# timestamp: 2010-11-25 11:04:09 +0200
# base_revision_id: andrei.elkin@oracle.com-20101125084739-\
#   m413cpf2n9kzfntl
# 
# Begin bundle
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


