# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110105235101-a5t6z9zgo03h04w2 # target_branch: file:///Users/mz/mysql/ndb-7.1-dbg64/ # testament_sha1: af6aa2bb83bfd05fc30f6d950a277c0957d95de9 # timestamp: 2011-01-05 15:51:11 -0800 # base_revision_id: jonas@mysql.com-20110105101116-2wnsuazn06765c85 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdYT904AAjlfgFYacOP/914C DRq////4UAQ71mzgbpcmNbahJKYk2o00U8p5M0p6n6mMk2UZE0yYmmj1BoJSRgmTKaYmo9RoaAAA AABoEkmhGpoyp+g1R7U01NpP1EZPUAxGQNAHMJgEwAmEwmmAAATJpoGEkkyp7RNMJhNFNiRpp5Q0 02U9T1DRpkaepUkr+UsS/zLw2LcTQt2rG4QTxc5GGGZni7wnoQgNUjMIYDWI4ZN9W/YwhmXhyQvJ 8o1jVtY1bXtNnabaiGWVKVUqo9dKNRpt3CNB8RP3X9Hf/fHCfjQHTOZGu20RPHP+sr3aOJI2wQwr bm6uFw57S4G148bvc/EpzEV41YQ3CwDVWfmrPv300x2c0yXSmswgZ8Ek8HgG+ieRlWwosMmEMgZF HW4PkKWwUB4KhXkk66pQ1yzgEiQtGHQ6mJlWgguL1rNBBNzYXbZAolExGTjlcqZtUjsY6tf5UYmO /RhapDGqHJcshkgTwFGJfpObVdApWLVQgkefQXSEskNgTzYyYlcSl1qgm9GpM6GDhTBHMpM5BtOt mmwR9VzxVdsAepdeOApZFw2WUZHFJF7mDykW0fYXxEXmEucUrIrEoSxlCI8lU8ZayKTblL1MEVNG xLHpGiStFiXQK6kvIFNttiTS2jbEgTuZUKTLbfZFNIxJSSrDJSOJlixQooS0akoChtc0XBdcP4qo dWYDomdkIrIj6tGc7BdwY4M2Qoonuqau9z3NChMM4zQkTStAiEsW+gjII7xqKC/QWM6zytyqUC/K mZvXVds00T4Yw3WySM0yslESiJY5XBTueME+o6jDrFQtlc3Rr6dtwGM5pssgFrE5uuyvz3+RShxA 8agHxBy87gHBt5qoxZC5sWk5Urqm+MuraJYMnAnHE+FTdMYcyHHWX5qhsr5uue3fprgwHFItwd0/ qvM8ikCWzhplZVBeiawH62JpswjhAyYpHE4x3Fe+Ija13TiXG6PO0yHPC2+hB6gseX+DNrEOn+VV G6TZm7MUGPVj4TnJMpJFozOqp7HGrSRCv9wT4bdOjCy35B7jKbXZx8R3bXiNDFhmSOTrEREYinzC e6UG8ybIherAxKdvomf4aD0EX62IFzIL/qFOrlozPvD1hPLaqIfCKxMS8NhzWgIhFwdWsiA0xc51 nR28JjuSLa+87xnZ71AKH5STCaEB38Efv+Ku5pMA3SmcBs0YKkeEQ7x3sgpyybsEeCwRIyZbHiwt 0oUA5qx5utA7AcInXukU1UmRjGnC1mXX4wJmvRWa9x3K9TOLvvOeCuK3DhDIjXjI8PeorWyN+YKm QSv9rJ3TNExZnVemNutIY5s+8GqLW4KMGlDpU7sknEWUk0vYxl+5c/lZVUZzXRfTWMgyhcEGWl1q bz1oJofR5ciiosA5hcVkVFgSnZAGD49K7T2nEUdAHGcgJ6nx/4u5IpwoSGsJ+6cA