# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101020011440-isra2bdj0u4if573 # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: bf1ca7f8ac3fdad1b17ef439a80c287a26b9bf3a # timestamp: 2010-10-19 18:14:50 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@oracle.com-20101019231444-\ # pwpzhu4sz7x2bs97 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe7vVA4AAn3fgBgceGP/93Mn Blq////xUAU54HTWWcagVqguElI1Mp+qMnqeU/UyZEB6MoaHqaDQAD1NBKSp+o2VP2oap+iJ6ah7 VAAANBoAABIoEJqPRPKGJ6gmmjEYRgj0Ag00OYBMBMjACMTEwmEwQ0xNMBJFNNAaCZGhHomIhGj1 AAM9UDTSavWXGjPDZPM7tOc0ZF89p2zekISnJIjKBjjLdkWR+SvQWLeWT07lj2Z22eWpesa5tS0R WEoxqLNTbcDV7ZYTfCBNM13fUelkZKrWGyRRL3g97i4IKzryz0kd8Ug0PgsTExDWrYcCw1N/HQU6 DiQ49C1p3mQjparOuCEc1wD8ZpVO/LrFdmVxiD+GaSgwkMCWzYhO7JA5EamFLQLZ4xICdHlxpIQq oHONncOfz9uClW4vUrEeh9kkgmQO6QT9g5T7CdINn4OE5EjRmqiO7p7t5vJ+6JWBkLL+i89CMji/ pLSGWt4nYqwi+rLcrRxF9bJXW2JFBM6aQxECLmsMwil9BPNi1rlBscymE9YW/8K8hmbis0Gt0mE9 RlMpF5LfzpolZHj8rpUCsYGcRoZAaOPdIlEUBG2DvF3mFdVDMy1IirIlkTZ9guGJ3TZSZtELbSc9 IplIzjmE1zPUeMsfGRsi+ff0YZhmPQz02ZmZiFkrslX2s0hLYsZfS6igK8w9F2dtVHGFiG0YpQwY Y6v4TUJPm3HlSBPI8t0zCi1peRIj7TVFW+18KXE0gJTrxIqZveLgR27cAxlhDadUEKJkHqgtugOa FszExUSLxzQsygDmNDKDkqhUqGfdYH2Nazh2CLODneYmJHolTIxsGecO1BefGgfrvzQH/YwPwu/0 ZeKZgWH2JXCHOL/xKBYv0ROZcdjEmW+zSFQCr0Bbp0t6bLoHWljtDNeFCKpcJKNS9SPU95gJn4QK zdAUDC8ehGqZWu6mY2DUXU1RBgnvaNj7yqhg0UD1Rb4NPXrfZKqP294c2x/a85chuUXKR0Ih+aEW GfgHrjkn5Tw1lEh/VSBtIogHxBPCBsYZM09Lt+JXqeP8EFoqwkcYLOO+2YSLptdSLF5P+749aaSg 8atpUVIPP2UTDHQe6lL3Z4mMV2kg7X9dvAiZ5uTxsVTBSdKbDducvz+RMGqoXcTIs4bzhjZRqYb3 WoxQFgFQOQUlhmN5wDdnHdGg3GmJxN6exeZUg+fn1kHQrpWk4ewrHc9sjTyQcjoWDNyFZVNSgpQc xYBgb/Fc+1HBrTufkDFBitQZdleuyCcNGNrIRi26BRhM3ZmKBpkAelKFZkGumCm1mUugkM8woSfU CVgrBpgOBzoQhjXcVZHkcONpV1yBFiBmXQL8nqOAMhDE4UZYqsMSwkSXKg0ypsDINhkIYkM8yEOY UkEnpN73lzFa0VC5Vjl8SE0DaGKUSk8LpRm8Ekb1YDIUkq+lCPgBBGTisrzPFY5DMhqCCnOSOiCH xN9WVYwvrFleepVgS4utAwQWhOCW0i8QcDjccjNV4IGnpQ9tV08xBVpIj5ZDigexlcKu8mC8JFvD wSeg82Gbl5NwiFZcxYKx33eBd2FnDYONkTkzl5oakCWZaDJIpAqF9CBpmRgbVuPQOYt8vq6mpgki 7X5rko6EubgFMVyqKFAcBVHPnRgTFbyoQ0UTdJKT4f8XckU4UJDu71QO