# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110105235543-6xl95bygdxo2uwk6 # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: fcae94b5cb7583b556763728b3e49016d34678c5 # timestamp: 2011-01-05 15:55:52 -0800 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: jonas@mysql.com-20110105101116-2wnsuazn06765c85 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSD3obAAAzBfgFYacOP/914C DRq////4UAWYvByhK66ptYqqowlITQm1T0xJnpJ6mnppPU9QeoaAZANqAEpAaBNTKeQ1TymjQADT JhA0AAkUI1PRKPNTBT1PEaj2qeo9QabKNqHqaAA5hMAmAEwmE0wAACZNNAwkkEAAjEmEU/RgjSQH qaDEeo9T9Umkrthal/modNJnWtuExLXqzQxoRPVUTYxtxkRjGJVHxIQGyTYhgdYjlbxx8exiG105 iX4jKYO53Rhc7nc5OLreQhffSk6TpHBSjo63zEeMOQjNlF3p+kGD14YgZH86WsEo033iE29n3PgG Va0WtdogyXp1bp59R8Gkpbwuuf2PtIZgjkWi4nkEgcEFQx4nI/o8TPnu2Gxiqjy9xMkt6bnYAZ1O ri50AD8q6B7K8ZBMwyYEMkDILOLg4oJcEESAkUiwIoejDz0SkDGWwERIoLTPkPUiBlMkDhernzKp yQSPMwv1kUggwvZxZOJxISj08oFdW28iUYevd+EHvGae7mLmuAikbuNr+WtY2UH3xoN10FHHE3XP 6c9uFauHwIMaiIXuvikw24oJnsJVF98NdpImsKRzTGlhPuCdd4SitIo1SjhpEK0yLzlLLi/jplFA nXSYxb0oJNkLGWslCGo9TfeJF6yLOk3bwE2Gc1QoI5HqU5NjCmCBDeJo2Qx5Z6A0SUGoI1lQmYNS goZItCee2S0goXExrUmyskDiK/FG7DCFBJOrzVc3ISGdiNBNxQdkZl4WrDdfDSG9BWYPC+YqGZi+ zTlotFJJ/wwry65FOWrTfEpMLmaIww4MiUV9YxJdcEKCFpR2IV0a+WBcm5hY4OIrprgF2yHBN9eT jI8yBzhw7zGYFtBlSMVDYGboDholQmFi4etDpBkMTDSKcWCgziIyCOSZiMRZiN7I7/k+BlFWAVWM bTZvpu9NuuymuePHgOczTq8lESiJZqxwrPSAyHthT3pqH3IEqWUOhr0dGYA4JDHPXkIRMqhxfmxk BnfuJgHET7FwBCZJyPcxAHB07CtRb5aTm12w4x+W5OaKGOtxS5hAFyIkuXh5xyOaKiExWyNwG67C SO60XTGeyXab9EzhgD1Ei0ze9P9MCqJO4jlwNGUlRM4OUqIjy/nueTA1Qjg5HMYphp1bV6yd5Qfd uCLMgNby+bDd1GQx0JzvhQhfClhlg3COAUfSzDwb2iI+iaxXGTztYWtpKopyKNYtXqKDJKnYIpBa 0qewfq0HVI2FQUS3/qoJFW2/hr8mrGxvRPMVV1BoL4yJWqkvfyvNjLmMxmkWD8gy4AVCO5BUYoIO nE3uU1iW07lSWnQ+AYgfzpXwIy8GIhiwgy9hWeHz1mBAxS8UqJTQqo9ZhajUfMGyFvOwtYE6U44O oMN20oAO0zwhkK+0+Fi7kkZurkchwBkIaTQiIVQVYP1E5Einf4I/34FNaMRGAGOgmeAMslAVCW6Q uhGNdrcVMr3j5iOwWdBFoYtt8UG4NWJtQKVLsLQQXniAUCcIpRzeKe59LGkxZco2j3XVLAOdFmmd u4U/LhS75xkJHrLyJEQwE5wLlOdO3gTIxyjgUhMMIJMPvZPeJmga2cRUyEjFmSNsE8PWk5mJjfcL AVMmLWKyFsTvQVjzZBjulP4NMD977S01HgVGNhcDCCNYrUnsjAeLQ2onEEiH15+ocSgVCzS3oMwk FwJioJJfYLQsghkuu8O8XyOJMgo2AHtURQQFSU/4u5IpwoSBB70NgA==