# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20100920232442-amfbdtsj6rbenk2z
# target_branch: file:///Users/mz/mysql/ndb-7.1-dbg32/
# testament_sha1: 6b7f9ccf64ad1117cfc284e88ed3479f8b11da82
# timestamp: 2010-09-20 16:24:48 -0700
# base_revision_id: jonas@mysql.com-20100906094620-xkb9gqaq6s9lm1tx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ/xsLoAAUbfgAAQUGP/91IC
ABC////wQAMHLac3EADIpoE8iPQ0mImxTIwIyaNBKSbQU2U9CAEzUYAjIaGg00lPU9qJ6QPSAANB
oAAEkgmhqYmmE0mCnlPE1GTQaE0B09BzK1EmilQX2LXEssvvTmOvEeKZQgRgs7xz9fS8nSIfpA1s
6LCvMKgN9SdhXR9nuEBh2wBpzFz22yVHejsltApSvxdTD17UFujVp7gmyQ9zAmdyHPA5S2t6LcQl
K9kzAOVCqTSMciiPGxDnH1hdFOBd8zbgxYoRsorZDG3sd2iYRWamjKsRwficJyUuOFwBoADpW2tA
mAx9Q7Vgg+xwZ22xZmhkEUtzKBE+VK5PrHstUZwDTSArpaiDCu+MFGW5VmVo3A1WbKDbi1wtKihL
DMg0vMakrkgj4YsN1EcOf9CfaaaybrL6klJJ0mxpkrsxPvVbnRIsrqbFlxFBozUMRDKZ4lCKqnpK
xYvMMVulzqC+SEqIvcAYF4YCDHiMEuFKmfKtXSqSPRITkEnuuqLTCKPLKgVJq1GRFSgnSRK+MOXn
x3SsgWPDIPXX9RXx7LvNH5qSdStQ9fq1LxhgdDHmUX4B1A3CXduyD/gc6NnmGy5EJ6Ahvk0b8JtO
NVAY5DGbAvFh1va6TJ80Bw0Wg872VISqcPU/VWMtFVo6Z79fykonpcByiGXINn9tSPcL9NM6M8KM
sjtF4Nw/ih08HLnx47oJmkDJ13e4wgLmRLSyNZ89sM2OpT7E0UnVdTkZBTMvwMS3TcmhgXwuDFRI
MB5Cfzla+4N4aId0YV5QsDYL6K8NuizCpVuCC9GqSaLcDPX9t6r8IGTTD8HkbZnipvsHCyRUh0D+
qNjRZJpjPSbeyk/jQFMXcqReRkPZMueJbmkoB+12ga0ugcipVPVnExsxvZl7c4koS/xXnDasl7nN
YwuU0jx6icQRV02EruhJYv1xqAjvc5TTlK2h5qODV8AaQHFvlUioRTLTe96dNQGZp1TV661XctQw
FQTB1wnKz3XxDnWBKmlXhzNavVDoJy5ruirUla9qN//F3JFOFCQn/GwugA==