# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091015103744-zblagux41kvw61nb
# target_branch: file:///Users/magnus/mysql/7.1/
# testament_sha1: ae308889865496b35900c5456f69dd572b4a46e0
# timestamp: 2009-10-15 12:38:46 +0200
# source_branch: file:///Users/magnus/mysql/7.0/
# base_revision_id: jonas@mysql.com-20091014114618-mizqbuwgynvwjauw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfR3nn4AAXxfgEAQWWP//1IC
EAC////wUAPZnotqy7VSzOCShCmTT0JobxUfoaKeUA0PUAYSSEmTMRMpsTJqnoRoaaeoD1DTCUIK
eVPKZqejI0T1MmmmI0ekGgDAAAAADQaANANAJJIxJiMTEPU1MiPFMJvVPKNDCgy3GG0/X+NcUUVJ
q2S1zzQqELGgSlB++o35FVTnyOj5LerLfkxN01OxzaXvjsX2qMJvdBeiuXmpBRynVZ+cOGdjqx/P
RvLzSdne8Rfh4FrGMiAjk+fGhxoVL8k9daRV3M6AGR+0wtVcOy19ERsnSJzNmzbMMMIZhkDFzhTK
8YlEckWj6ikgcfKsmi5N6aBhGwowW5l3wt5S60eJ+h8VHgpmEBOsjdQsqWfWaHaoZcBVC38N3NCk
RINiYFqfSRMjiYUBLtMraVpVZQRx++JHeJlWsvBQiKe5UsoDeonEhUDiCOveWGwwJF4xYOPX/9Cr
S/EmFjul7mm2ZQ3Q2k5dPMNFk5CTsxEo96KOI5iRRq9XlUjnWJrJpSlJeX5fCqFUcnBxeMdx7+66
/Nxj0L7GG3pFxDYiQoaU9xW4cn5ioI6jBJqJpU3bHwGbOx2cVQaz4PLzc9iLmcqRAseDHbSb6X9d
6nULxT7OtEmcGJieRkQX/2MvX0tzpPmw3h8RA1C7XmuGy7G0XjFelS6VoOy8YI8GeXlRg9YlkiQv
MC7i/9L2+waCyk6E3edXD+62525M61InQw/mVYZurlMtemTSJCqAeE0EY4H4dtta7VN1JbtNe0Y6
Oy0nidUR9ZQHPQeRu9jdOdHn/tmypMRw1Jr3XZBsLsFPQBKKnxv3STOMV2xPIzHkDfwLi2xfOF5B
UNDPF2Ol4nMQfrhooj8lcfEoFgeOsmnsfGzfeQ0l1uYumUDkOW1grnNpzCur46mU8NdDJaQIYuu9
ByqpXXAiXzeEjIWpVreYC4MAusRg23lhaFgLNO97/YxTclWO7tRLYq/wRpNfyqB8C8BkuAykLKki
FWSgExPPbKoHshj8oGXgp90O9iAKpBmsnKhF4aFwTU7ZnEwBm8lKS7qTQH8+uWddY15kyuLUw76K
o03osaQdKCXPCoVvyfcyf5llNiqyjnREOXQ+JrWWDMcXK9mAfEaSdiO1gxIv2AdFcjFt6oVS0ByA
bqV2QbzOfN59+pfIc5XYEcHY1jinOgKhPZRcONucUHrRTwpSLTQg0qhcVOJVIikZ0aMwE9YmJLuI
nDRa9DdBLdhWQEWkM843MzLtIhSkGtpE0hW+iI9Lv8XckU4UJD0d55+A