# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@oracle.com-20110207105932-\
#   np66dy8ltbc1v7g3
# target_branch: file:///home/msvensson/mysql/5.5-telco-7.0/
# testament_sha1: b7b9b00ca043a0e0b82a393473b0caefbc247a29
# timestamp: 2011-02-07 11:59:37 +0100
# source_branch: file:///home/msvensson/mysql/7.0/
# base_revision_id: magnus.blaudd@oracle.com-20110207090316-\
#   03tn0nojrtd8m870
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVEFLgsAAX/flAAwUGP/93KG
CgC////wAgAIAFADzXt2le8k4e7VtwymlPU2RHpMmnqTxA0m00j1ND1PSAAykYVPehCnp5Ue01IA
AAGmgaCUUzQpp6In6p6aI09J6gADIAGgklNJ5CZT02qZk1MgbSGCaaAACSSMkzQmJhFP1NlT2qek
eoGgaNHqHLPb7MfSPW6IT90MejhHO1CddSI1SPUKmpQ+lSlYdR2yRKqjl0pppsTyOzjbzJvNlhDd
+SulSyb3TUZ2RxW40cO509LOYRQNlaqy0YgjILFjnNKKNPEGGVN8y9ZI1khqsjPLdKiY0dEuYRIk
Y7LNZQGGeLxtLScQ5HpFIJ06hiKvlRKrUMMXCEBPYv6M2UQzj2gSbNbfzZHxGGx+8KGSDo1BigmV
2q6wbNAarBloAZAjJ8Bpy8jeRfawbE1HLU9S6k7J6dqLTLA3lTyyedccWeUJxsfTJYScFPNqyvAX
PXNhlmI6TgLnKpakqgcejQ5xMhUYtpXO+80mLbA8R4HK3xjLNNYM2GamkKCRBtvNOO0crRzBBMLE
4YOJKq2VTEvoK85ZWmKiRlHipfZfBkbWC/nBaYIVAxCILmhueMBgEoVo6KnqVGupnsi5iR7kz2cT
A+DbCi2ydsIrDha5I5J9DJgkeJyYG89jZlOJ3SzOWFEfd/kwsvZlYBCm/8jjUeAp0WOHg8kZw1AP
iskX6gPnVLF1kIabiR04QtqkX0DAKKhZeHFIrQ+7kbe9NsrFAcxtGUm+J96MrPbHIkW1pHN1aUxZ
PJkZWdVOThMTK+Czjs6eTKCRKjDnnGSD9Bn3RCu3eIjx9A2wS1bAX5qwTslCItmFoQc5NsBSkbQF
2XVb88u1x4OmAaYoVv4qb7oHZuQUBgVFYEmpAl5bzNPAz5bhqAnJFJUt5ttzJqqwpD062cWPaOWF
ItkBac1SE3fQaKgcLMNWr0+CajdMF6cXHmExCnzLP3jc+h4V1BqHhzwHQq66mnd5T2WZngFLyI/G
AbglcFKQ2roJDnMygS3c3F90L/mKCLafK4RAwijtQfJ4i1a8U5Cx9xy4VsxODxVOJFI5IuYI3Jrc
o3PcGO1xuThaC9J7LeCkUdXTQU2VKUFCLBJ2kc8YY7pGAXRWxIuGVyqFHFmUo/6m4tHynlPbmV7Y
hgZJdrah1TGJE+iUljBWxdXmHm1QkYKbHMkWE9gOlprdm4qfAHYG5dPE6dG93YqoZUhGt2VRarSe
7aMy4iXo/LVR4UWaqKxXojYY395tS0M4RZUXftKRu4za82A4oBcHikV4YGs8M/FhpnaYEzLVQdIP
IXUQEUn9u/xdyRThQkFEFLgs