# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110222212155-mkxw59ax2x4wtowv # target_branch: file:///Users/mz/mysql/ndb-6.3/ # testament_sha1: d97b8d42f66fe0f68e4169002c41d91839b815a2 # timestamp: 2011-02-22 13:22:05 -0800 # source_branch: file:///Users/mz/mysql/ndb-6.3-ndb_restore-test-\ # cleanup/ # base_revision_id: martin.zaun@oracle.com-20110221173923-\ # n8sib38fzq7rh8rp # # Begin bundle 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 6y13jcb1e80dJ2mYxFZxLTs/+LuSKcKEhmjlAcg=