# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20101022054704-un1bcd3hk401y7c2
# target_branch: file:///Users/mz/mysql/ndb-6.3-wl5421/
# testament_sha1: c3a8af27e2e2769f2f726db677856dddecfc1b98
# timestamp: 2010-10-21 22:47:20 -0700
# source_branch: file:///Users/mz/mysql/ndb-6.3/
# base_revision_id: martin.zaun@oracle.com-20101022011545-\
#   v3i8y1c5btsfx4qe
# 
# Begin bundle
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
RzNryf6/N/8XckU4UJDRryQt


