# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20101003043237-au79m114z3hv6rti
# target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/
# testament_sha1: 47ab1cf70f24aaf0e12a8328e4b05761be026caa
# timestamp: 2010-10-02 21:32:50 -0700
# base_revision_id: martin.zaun@oracle.com-20101001090306-\
#   goxvy249bviw72x6
# 
# Begin bundle
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


