# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20110202065212-deeqmifhh6o9p74v
# target_branch: file:///Users/mz/mysql/ndb-6.3-bug54327/
# testament_sha1: 00933e30a37e2791e2d15b118deb4ddc1d06f6e5
# timestamp: 2011-02-01 22:52:24 -0800
# base_revision_id: jonas@mysql.com-20110117125326-2bmbcjjmv4mqdibf
# 
# Begin bundle
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


