# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@oracle.com-20101214144620-ewagjogg7uz31cgk
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: 977d491597d276b7e9e95543f5fd6abf87551423
# timestamp: 2010-12-14 16:46:36 +0200
# base_revision_id: andrei.elkin@oracle.com-20101214085716-\
#   gsajrf9l0lmkd5xk
# 
# Begin bundle
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


