# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20101003044910-ymb0x3yhr5lysid3
# target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/
# testament_sha1: 2fe84b934b138d11d446fe9544892214700681d9
# timestamp: 2010-10-02 21:49:16 -0700
# base_revision_id: martin.zaun@oracle.com-20101003043237-\
#   au79m114z3hv6rti
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaxYOeIAAdbfgERQUGv//39v
31q//9/6UAO6JTetzu6sRrDRBIzSeqNPTR6mk009TT1PSAaGj1GgHqZk0gDRRPJHjSI9Qn6TTSYj
QAAAaeoAAAkimTQCaano0EnojZQ0A0AAAAHqHDTTIxGE0wEMAmmEYJiZDTI0NAJKao9TR6SeRoaa
nojQNNANABoA0ANEBBlp2Evnyam0aaP8yjxcW0NRsxnsCZg2WO8zPXeEQJySAGMBjofb6w+lfcn1
lMGY10jYpgPevLSLx4jXbaB8w9hoFXi9PuLFX7HgqClssMzGkxxZM0oy6+t0wWNRzExp0KeXnMA3
YFi4++EllaMYISoqMXQOEoYZ5uCMFgAaUzF6RSqRkiOL0RgllUk9joWfe4hkJgrEb6xDWqXBopoK
dVkIjTPgKtF+i4UkkduK4HRk4BCVvJutSWF9ssheAshiAYTHQRZVvCC0Ihsvb5OkM5J0LaaK7QhW
rY3OGmbUiTcrGsQ9ypYKIsoDT3PVAMS4ZXRop4hxFbbsJIwUAlk4nFZEijIrLyBQFtt4SkYcyhZU
gMWTjiIApYPTBSFZHpNlocTUJZVJoCl4OmTDzAmNAXrD1IQKtQbDqqN87NNRJC4xbcGVCZbnqBX4
qKhWE5agk9p4xNagumBsWVHnVM+899UCGdpxQczRmTSaJQEqG6ak2/DSjqOZGeFra9zEtL6iIR/F
+3CZGFarPxJV00baIK0KsvgzsRWxSFNjzYrIbVm23BdgQo3lNfU+i4mql0UmRAFPmkaCWSQM8/MD
8tFBEGCNgw4yqo83I0sXRLGiEEjmXyy6gj/LSRoXZxxC6RiHPh5ScURSOrdulyEIsRwk+i7asddf
zIchELCIP0GpbX5tB1idEmvGoVBQmHmTe8tUHvuznXIKaiVy9+3Qw4CmC/WQSCwTZtWe/E5GMA0I
AmUa88LArFRTA4Kj33TPP+3LzpTKWrK023QWtSCdPusL9g5zXYEC4sP5zy59DqyMayMCuoq5xUBY
UtwukGriyeCdURbJkxK6VOSKmYLMcHHrctveGAP6mpjyK+slpNdBpwiCJgprJDh9ncvboOndcrPh
viciQRtgzZ+2cGGHNfoWIVcM+LZVXk85HM1s7iTcqpTxSG4KNNMZgpndbm1DMmZMt1hadV/HaCkH
agVU8UjaDrB1RdwLe4scGZTEe6qcewTx0tpXgE6S7+uNkydEuiBRvwtKk800PEA7gBLgZV20Wsq5
kUcTcmQFDGBacSPeWY5zaQplx7ZYY8kYfg5L3zYEpZrrEXDAq6wZfJpmVlAZ9zoUYpoykHqwrIVs
omVdcIqBWhZVlCGJItmBQvU/4u5IpwoSFYsHPEA=