# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@oracle.com-20110621140438-\ # v0biq282re976bxe # target_branch: file:///home/msvensson/mysql/7.1/ # testament_sha1: 8e2dde19df4fcf50a77b07c7198738fd49c81793 # timestamp: 2011-06-21 16:04:43 +0200 # source_branch: file:///home/msvensson/mysql/7.0/ # base_revision_id: magnus.blaudd@oracle.com-20110621140155-\ # gb9y3h83e8ie9m81 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVTwQNkAAYZfgEoQUGP/934n kSC////wUAOGAPNVKyiEoinlGmKe0NBDTVPKepo9Q/RTE2mkND1BzTEwAJgAmAAEwABMElEwJoEY poyeqbImTTamjQBpkZBzTEwAJgAmAAEwABMEopqbBKemEh6jR6mnqGjIHqAHpMnqE44W8k9KORdT 9W9T8vLVktpAnvY5j26oCMQdHnQoq+vmYfp2cXFTue2uY8tLG9ezjV6Q9lT1U9/TZTVXS2ivijFR rnpHp9DyoeYiyG1aG2GWrmiKUW4iI60ht9rVqdZW2ThTpSr/VLJ7EJp0LsNRJOThMQcvE7Cpntiw qgmKfqLPro+BpgpMTX2sVsXpiB1OQ4dUhGdEDn+E4Pti2xz0Hmom6b1Lv6qOJk7NpcyX9vU2T25I VWWaB5UWuhUOLqnZT5f6VHoKNaO/iszWWHc0WEbGF6lcJnHZGSyOlYyrBTIbqp0E2u98S14zN5gZ b3PGMRPSE+fiUURw5aHPF3s6rLNNaDJ1r8XW23AwzuFmUKMxYYsOh85kB82ibW5X1je1pv1R2Cvp 2rkJC7VZum22l1lRQ386IKWvY4CZVLZN621qZe9tlmfNWyAoLvyD3sRXLKZAa5e8bpnMupTr89DB CyG4eSKKYGG0jiPMD7IPMTabiJbEdLmJwxGFxOQKjKZySzSwOnwacGBs13mGvfZ5IhMTMD5CC/1i ZQg5xlIhSPSoQsp6Oq9Oxhrl6e6A8S8QzKt7YiagmR0e0lNTjLAflbmOy7qMFxexUQdy5RRCKpZo I7oSyzJWPS5lRW5FBGDZWViEhXZG0onJva/+LK3MFRBVt01XGOOacxRTgJQnfwhgvezpCAbYYbM0 JI1tVVNsxFVoYdxNUxauqMSieuS7XoGjTOD0bKVWLt+7TZpO2/dYpwGPHpchQohoJxUWoLxpD3Mm 8mYrm5zPJRH0RdaNphnLUYUqRwCh7e10XVhcJtDzoMHMWU30FKSxDifjduCsKNCV4jMkdFiQwzGx I4wgTs8e4R0rUu87xjS0nvVsvWDzlc9x416R1xDGTglm+o4RBrExi4iDE333U1Ajg4y5j/IhnDQm E7U5828XJVczxbZYqo4iyGpZ4wxFvK+RVpLIwE5Ed9xE4SWLb5D3o4NuENiFrnU2DMGUswBtK11e RQkEUy7wXEnVAqcXsbXYYRlfgUNCdAYDE9qt+iqwrEeBTZpupQRhhn0dd4j0uDItkJxLkclaSJiT xfG00S/8XckU4UJBU8EDZA==