# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20101022060055-ii5gm6jb0r0w0k0o
# target_branch: file:///Users/mz/mysql/ndb-6.3-wl5421/
# testament_sha1: c4f31aff982000346dc7e315da8ebc905f7dff9d
# timestamp: 2010-10-21 23:01:01 -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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
hfY4wmlbPI8PdS9h19r/8XckU4UJDBVKWwA=


