# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@sun.com-20091007032307-zk0j333ls832v39v
# target_branch: file:///Users/mz/mysql/ndb-7.1/
# testament_sha1: a91358f6ff4e17516d1b0aa7a8b027c8d7236b9e
# timestamp: 2009-10-06 20:24:08 -0700
# source_branch: file:///Users/mz/mysql/ndb-7.0/
# base_revision_id: jonas@mysql.com-20091006141817-1d0h2yuvhg1fsamn
# 
# Begin bundle
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



