# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110108054307-hmq4hepuwzlyz8u1 # target_branch: file:///Users/mz/mysql/ndb-7.1-dbg64/ # testament_sha1: 683c929fbf0f37e2cf3c54ba4558024b1a0d5caa # timestamp: 2011-01-07 21:43:20 -0800 # base_revision_id: martin.zaun@oracle.com-20110105235101-\ # a5t6z9zgo03h04w2 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRyAZJIAAYDfgEAwVHP/91IC QBC////6UAN94B5OqAEMqn6QjTTQ9I0xA0emkNAAAaGAAAAA0AAAAADRKeJ6mk/URkAAAAAAARTY pGDUGnkho0BtEGCMQAJJCNAGkaZMmkmAamjU9R5TT1PU2oRGrS1WOQFqzEA4jdAAbbFZmRPtCkcD EsiQCEV9QuPCNrBxY/lE096zz9fm+U07XwcSY+rWOPtv3Np4L0ZPYVKuo7nZW3WHuI4+sxYGgtMf bPmpuDapGlV6qSGwxtwjPZThQKLMGLK5MzIGQMFyyOtcVuUyiJ+ovJiAqIJy6dV00PguKWU7yZfd 3B4bJqEFVCegyM9noJRhNEmvuv63cFwX5P1U6z3x2tUChpsOF2+SMkKlY3qXUZKM0baVxKiUAoC/ P5Itatcx1wrjXWmYpM7N0FfjCclgp3djLRk5ilPiKUU0vK4rescKqypFxHWr4FWrVapwcpzEhGAt gi8r1lSEd89v+T4mMHo1gmCqTo3HmKZQV6rQJ0I5JCiJsHoIkeRPvQEYWdiU2hwbR9BSxZ4MEKDr GpkFDQgjKVxvNqKwTG4Fm4lF6aLTFARobzPS/bRs65HD5bo3P7nSCRPayY/t3d7Xvti4LPCB/3Ae Ha4n7E7uhy56HVCrt0SHkrNIynCqKJT9sjzKSELEPuAkfTSudYjFyrBI8KKUzvhjLFdALOCz8Wv9 PUr250t9nJD7vQRe0hz901I3NNh18c1BXMXTCEY4UYGurlmVG43GG7ojDMgJhs5ak3yXVSwN1PTi 862sK+kDE7a3bd3VMXybdynq2bD9OO88EyxWAmlk6XKHLjwGfSiKe+HZfm6RhUf72/bnk48CnsmR inXfws3ZBRqLvFatcziSm/aaHEuDJPN7Am9gr+cr3yCo3Byf3+dDeORuCK9sgpClwT7LvTDkhja/ IjMbC6At4eZ+Bnb+arfYYfSpmmPEXOqi9oskMOSG2ohBapwUzu6uCHMmVX4V63oUA3vMz9pHWFC6 OVnCxa075My7lmolFWMY1CnFdHg0AwHJLwmJkUUbOKOqhWfW6D7Z6gUck5OT42OazixVeDTrSc+P WVVjBvrBzP6/LzT3ZlY0k66sojhpWMCiFQOZbu8W6nQW1FYKlOm4izmVa/rENlkLxVagmXKsWovy q6KEjecj6BgrNOJ/+LuSKcKEgOQDJJA=