# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20100927053117-chbs6r79ftx7jk4a
# target_branch: file:///Users/mz/mysql/ndb-7.1-opt32/
# testament_sha1: b566b3c21cbe48406976b30c02b113c14829ffdd
# timestamp: 2010-09-26 22:31:30 -0700
# source_branch: file:///Users/mz/mysql/ndb-7.1-opt/
# base_revision_id: jonas@mysql.com-20100918141351-ld3kvph0oqlg9da9
# 
# Begin bundle
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


