# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20110204152630-czusj058w6ltwz7i
# target_branch: file:///home/malff/BZR_TREE/mysql-5.5-cleanup/
# testament_sha1: 25dae806e49431a807ffd188643ef7f39c86ec1e
# timestamp: 2011-02-04 08:26:51 -0700
# base_revision_id: luis.soares@oracle.com-20110204145904-\
#   2u4neak21owtv38p
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSssG84AAYbfgAAQWGf/93sC
2QC////wUAP2z3HU47amslOEkhATIZGTTQJtCnpkyQGTTRkEpNI1NkJsqeCJ6Ro0AaAABkGminoJ
qaMp5GSnhMUek8kHpAGjIOYAAAAAAAAAAEkop+lP1HqbVHoTI2po/SmmBGgNG1Gmmnxez13eJZbF
UxfhCnaxGsBtysZiqw+4dXB3B7xR0TMWY7dtRdb17U7tc7IefliV+62rrdSPrL7ea6mZayPzQlRX
ONqW1w9rcunR4pzI2V4K7U22XPQewjFSrJMYtGnNc7Nv2FpHkUxPUldekUxqRWPoihVnjCt3MW6G
CSgSEbhDlEcg6FK0V8eWvrpY5lBXGKQGHym2Mg56zplNpgiHgrWzuobNcW/SPKyuxNdKiSoKTnwr
bk6RMZyLCrC1SpK4sv2mlVELBBxJHF9IwmdQItBnlKdoT4PhiQS+xEmhS7J89+4rU/kmzprHVFVy
URUgjEAgVcNrATBvJTSCfRI757sVFswl+IFeYQ6kJgkVGVfFb0YSoHl0CeIiqNYmpM0ZIuVe/eJE
pGaCwfs2QzO4EpC+dAnQPHQhrFqxxFGzZBsM6RCLSLI2DrtmJ3OMJjvljmSDM+NtxqAfewMihiXD
gQieow6aJ8rE+/77OvVXJYiQoYY9boQ93vIvZncPHLXMjE6ilnDgfAusMI526AvjCXHRED10S+De
u/0rolnm4/3UllR6LyeS0O6ccOFDtNXNhxFqeZzw2Frt1uxwVy/tyXUoOZ2JujywlmMb/UoqK3/9
inYF7QSOqI9zhdqnYZqmmCoaee7RZBJQS9qOl9KQFsOI5DGbSbYSCAmMO1wUyilOvDdBuTsU4SFF
ahXPbC0n8N/zwmL7/razYrM07Tfxxn4mNCmV91L7C0EsORZaw9QGlwNQhlgOQVEguTBgBQ1+92+O
ep6wrZzzj6k6Idm2lJzzGVGcrVoaR6ydzkXhu1+BpTG5pjbja7namqkkykhp1hBXLVEj0CnJjjo2
d+OjcdiL0VmDaQ8KGjMLDflCcLF1hkHmWsPuAQeEDCZmSGG3ZP9QCivc9rbOWsxU7xXrsIrb0PUN
W/imdrh23LN3HlwXwviIk1kDFpuFQKQOqF9iqZSVjUFKKUgqDjuTqI7wEdPEjgymoZ/XVX4eqICA
5X9Hqrmd00FfWrNGO5mUR+FCfy6E8ENJFO2Hmw/qN2i2MbV8uSVb4AFVFHV5Fk3PpROE1sc8sTMo
Lz7kOCFKtnc2m1aKNavIBYBJJXzTp3nxwFiYA5wIoW54bM1T3SwIJoY21RyjqxyhZwoNHEoCcJqc
csFCGxUi/KtP1tgtfHg6yjIh/MUFu1sdiuVVI0HIV6pepxRlzfMveG2m5VM5pfULoE1N4UfBMhP8
XckU4UJArLBvOA==