# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110111200957-5rw7jkj4mixqhejv # target_branch: file:///Users/mz/mysql/ndb-7.1-dbg64/ # testament_sha1: 9fbd3d96ae53f0ecb196423cbc5d723bea3600f8 # timestamp: 2011-01-11 12:10:03 -0800 # base_revision_id: martin.zaun@oracle.com-20110111174055-\ # 975v2mkepb47qr6r # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY0BnncAApn/gEVUQABYb/// UyNQmr////pQBU7m90PRRq51pByVeEkimRpT/KFP0U9PEmTTMpM9TQQAG0IeptqCURFPU/SZpR+m qY0mQAZMIyBiAAAiaZUfqI0aGRoAAaaAAA0NAAJFI0aCnoGqbEYie1J6j0Q9RmoaAaAAShBpNA0j QmmqZmpqb0U9BPUNGgAxBpOGBCuqobWtSug438DR7G0OJG0tf/rppHMnX3qSh+t4BdN0Fcekx0kI OibwlmSQpkYMQ7feseo72d97TFSn7krBCAB5RoxW6LmGgTolPXIExeEzWsWEZR40YcibW6JVjgnF BCDEX1YeEeQxhM6oM+gWBNkSmdEcgDM0llLq3d1XLq0zeLjmtPL2ymYLzfFgZgYbqqKNVoVxjLTB /O6RWUOJ/XcKRptPkHpFAXoBv9XWHeaG3X425aF+5ceXnQupVosQurjoNk90ibrihZGmYxGpkBgD RE7VTQUiaNHgRGCcVCYxSUiIG9gkl3qlDoUPnuIhxuuRDKA8PfhzwLgDymhzWJ6CHbMIgCgoiKIQ j9ROIgvBSj7+cj2T6sfpD8i2OTam3dU156kpjmpgbNCUzZJd286y4auUMytd7xkIMIEO4VJha5SE zJxbaPovuGTlCzLFiFJUQsnKMCIr2lJmcXqSKmD3QFuw36T8w1pOboQ2gzIWZiDQOtS8rOXEeeJi VUGMKFUNUmYlw5/YF/hsd0a4KVjjmRkZ4xPoDBgsSwAtyNLszLp1gZhbEpB/IYSkCcujOCW5Tt0D JoxCuqwH23PpaBDZdLBBVq7wrZTlGgaRMGa14SOr/gN0wvptbZazIa1HHM/M5qpeSd1M0vtgw/nK ngbJ5Z+Jwr2qZusx4Ad19AsPmXDz3V8R9JptWlnjqsxOpki8AV1klEHot3B0QVmI0HnTMOMDRRcx 8xB9gy2jV6DVQhU2tsbX9W8Yo3NcTAre4I4I0IyJyUTDp6ZB6EgJLl68OiC3nZiptiiatddx4XU0 1brUt5+AUPtpQoNXy/OZC4Ld76atD32dhEOk2aTscMdO4tNfuhisSIbcahLNt6yc494V2c7MhbEL JT5OcrWhgZDYnDo5bMZAkiwd0oTjZEFHLdzRcbo9mAsTqcWrjTI57URFOW0X2SLzVyG1HlsOYz21 p1UVBFE/Jgyclb8t5ZmrZp3U4QN2SLZ97jFgVCYbru4OfHonOWoWsz6YPlB2r9AyLRJE9C2WGcp0 IYkVHwNhmHsug2zGXiZ8NNaXBPv7KLmwizxgBkSHkGPuUE/RchpFw/RUqrmDixKVMJbUY5r0d8uv NTNeh1YD8iK9qCgwiB2rgBSaQOckGhFR7ANpudIThbAN2BWhMi1j5JZeGZpWMtBVDvDtO1Mhn0qm xT3F/qAyhZRQn01CU8qndNBCamQuY7nqlrmyMbL5QLatD8dqIGJlJNt8oTinaU5vkp5oJsHXiMcy y7eY4kyKZbBKkXphBxAlrX9Qq0PAIRTTnJHtx9xqYp2WnEE04KKC9kg9bpiUE3EIV5X99jsYMsv4 /QyA6Ba+wMntBhA8oe9IIL1TRWYG/di3RVfZntVYk/9MPljMBGhDEqIYCl3ARisEqBjGirCufbds ZvcToQzkKle9pYFgpIaBcvHIObB7CLETzhRdmumOlguXaX0ZMhREwiLEtRBUjiwlDJNuoQQkJRS4 gvEJRtyJcoYy/3FUvSapFBy8Cx7SULATQbbwGO8e/oglEpVH/4u5IpwoSEaAzzuA