# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20101019225339-aozm9ulyrr5g47fw
# target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/
# testament_sha1: ec621b38135236480f54838586323927010120bb
# timestamp: 2010-10-19 15:53:45 -0700
# base_revision_id: martin.zaun@oracle.com-20101019225204-\
#   7iwdlfcb35akpf97
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcJwtzEAAetfgAAQWuv/91vC
HpC////wUAQYnhxdx0cc9W9CSQgSm2TU1Pym0ap+iNqnlPZU9GiAep5RpoMlNNME09TKQDRiGjQA
AAADEg0qeKeSZpMNJoGgjEbSMCMAMlTMoAaNNqaaMjEAAAADQJJJpqeg0TU2R6RPUhsUBo0B6QA0
YG20dnrqZQlNJLyf3Gff33AReY9Q2EBVBJgr2YEz0aXwEhMzxbrRgFKpqONt+0EengDPHZ7V1JLj
d4sbsU0pqCE0GU5wldXpXDl8Y3+fzlnl90VBguXx7rcdaya34JzItBZhJMLnTfpnufzNVXQ6iH9N
quFd3uKrou66uyOSqxI91FzlSrXJHvzOyy6vnRmoGJhHg698HivYGQmEdbAuQ4oTcfdI2kQ3TVYO
yfRfzuFeyoYNbzB6uYigIK5yCZznp6KQfTCjYuPjUomH8qcWq/E7Hk5IHFdW6ZmbO18kzNbOaEyo
IoJOxIZnEnVJBq3xtswlyH4vC7QyLaC7kwWF2rCDGqJIUCwSaDLCog/8asjFhdOwKG7jEcdILngN
iiEXhbbMQ+ly4WhwDEBe/KAtxUJQvqDCckS+YcH6cashDWcqlRbcwWc7MkMI7LxANug4MmiaL3nE
0BkaCRi1oV3UGrOvspCBRC2N+65imLbBWjqiscg6uBlAvOu4SBusm1FuWxjWmBzsLXgU6kKAPRdI
zPl08+QMzrwPq6C2emeCRiIiOxhj7fjC+LW2lvCBkN7MMdapPSjpCPJWwVeTz/G54Re0+KRjCYeG
Cf2ceCnnlUvTiLHKiPPpXVwlD17Uj2PLddoVXLjo4cX46pt4h3Imlj5NDeNojwrmzo7KxCQzUSFF
WJamOjrVBwCglArCYiatmJE6h+aSfUR3KqailTG4sYFWOOU5ZZ5whhr73MR6G2u7spGEu/1lroa6
nZ20tdHZm1tTzcbtnBYJk1clmi1otgawtLYzIFMqiiLSyZfdTrPqK5z+fHbQxuLRXw3icvOLL6lG
NuZE3ZEwk69InpAkR7v8meGhm6Z4t7ygmwKX3BsaD+8NlOIUt5g55Y6KnC7pMg20HbTRd/E06wtC
1wNB9NaQ5cAebO847/B69kFZXEXaI7dowLXfvUBYPIJteY7uQRQtwrlII53L3KYYsSGEFAkY9KQh
hTFR0BVHZx0eYFkFQGJEUUeV7s4uYjMAVgs7KIpzEiUCSob7Rc3h0F9TpYxEMShQAtGcX2UmXfej
t0CzQReC5J/WqRFTYhB+fZCgCMb5bwH5BbIUAVrEcgibLggmSiX4y0hSlk/QGfKWPBI0elgQusU6
iCPDdrfn0Hv/Z1b3WGswvjPAPJrHAom+0JB3BthjGgnu/2TXpEdur7BlaUJCcgOc09c1wqa0qByz
I7n3EE+BM4EoroYJjEV16RYaHwrFV/xdyRThQkMJwtzE