# 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:14:54 +0200
# base_revision_id: alfranio.correia@oracle.com-20101123090337-\
#   ep1c4y5qca20qlug
# 
# Begin bundle
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


