# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101026104416-\ # 3jmn7rbtja51u86u # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 11de9228ca32af0580be5b67d5ea4b006dd79590 # timestamp: 2010-10-26 12:44:20 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: ole.john.aske@oracle.com-20101026094211-\ # e4762cj6kd8ks6lv # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaRkad0AAnPfgFAwUOf//3Y1 xkC////4UAVu7eGgNc5nVOgKASiEp6einoeinpkPUnqA2poAABoNAcwmATACYTCaYAABMmmgYSk1 NpGqeU8pkepsoaDID1GnqD1ANANAkVTZU9NT0nlNHomjTRoaaHqGgZANNNqASSJpo1PQE0aCaZNG ptKZiQYmjQZMjk6gpQxRNefE1vrs+rFrjNRXbJlYmjPJLMUGRESmMzNDsMr2IwjQv5ikBuoKdGEz lIxtsNPsGuEvBkpvylDsj5VmTZcK4rZWcZbKUKZLxzy17rgzgxp1aJA9bcox9xjNvBslGg/69nJr cwM01i6X3R/M15BnYjVRCUNANrteR4+jrZP7IhaSMkLqB9T285hwOdXa8/2j2kj6v1Y1US46MJeN WjQhRV8UJ7IXMNg+2g3EtvjERcym7ju84dgQYSZChscJPHzrMSkpAcTG0zgWOByKVBvq33sSq8Do 8gF9fSSF7bRwKwDYdnS/UFdUsJXklFNE4uKuJdGE4QiMY/3XmfUQAhgFFlLGrHt0lCnSXjFZcSv5 mp9AMawPxgO2kqKPiEmQri4KrC2ujMSq7BxQVGWl6LvPKwiHA8ZvPAxtjVAowmb4UV1NO+0mSlE6 qtS22y3DHM4ENiDUU5hY0mycPokTHxZOZ5EBxcVYBc4KCkBpFQzd1QcYDk2Nn49hblhGksOwCE4D tTWrYOLLg5u3QNPfE4mBs102gOKdmGlC0MaS4eDGwprFdYYjYxCaM5EjYeIbQ35gXGBufbhi3fPy vhoKSKMCjLS8HlNeo3Sc39QGkpoiuODokXOKLbd4CWDYtnUsrnyKETIoB+gvdrIYR1EYkwxKc2VE yJPfK2RbNyrkON20ttojIDlcVVMi3M6/JXcl4nGb5dRk9SXh5pULUQ+wuQbTbkD6WghnLCIah2GM NZMbIXAzaiZxgCwDJmzhZIYkSt3OkitC7cBkNbKPE7LwJuK5kVltCKif2jgQSpDYzHJjZCIX1i1d TLGdE2jBBZmbHGrz1+RiPmGk9xJFDL5b7wXKYHNBJepo8+QOmUFm4eYGSs9+jDdviH6RfFyFzUDs 3hoEtTgutKjKWVNMKlRAOmeUG94PwIQC6QC1trkUZJ3VHcDcNSQjR8/lWYHdysOAR+DPKOp0LULZ kYM68uQddSF95U/ilrKRc3huLnhpFGcdWBdr3YTvgioqDEvzc3OXLkY7otWiIbXCoR8hxCPdgHf3 6cdptNLggyvqIFJJZY/Y3HiQO7c8sG4kH5kFAO0XWw6hDE8cdUB4hYMpaSo6TCJVJcao4iealDkj rxLnMu6JxL+sMkW0Y/b6cNVMETOe8OSNXTw8qhu87QvAbiByQnVN4BsKxKW0hwR2HkHiuQVIvcF7 fPocka2FNC70KhHLfkKydIRWQOEpYu44rTM4WmrXV6AWF4becpKfo7/vZb5MFhU9CZ1wDKQ+CHeU TAIU0xGORS6pGw13elQce3JlMGUmBlHPXU+f32IWsPoakw7rWFTJLR0YPV4UHnvQtiLr10HqQfQM paaDiV5iuIYMMH4gq98Tz23bo18TQHbjfd6Fge4nV/lHOelFwe42IK8HKBJYFtKfM2tNXbBWyfad hOr1b3ro5VRMRlEL6GzCRmGeuxpFWNgPcnG1LHQh5/liFIPPj1OrM05t0Wm4LlBFj0OpnT6moGpB 7hqvA+BGmBjuDVqoB2gKIRnBZWVg3vpr8rxuYGkki1YtBgtJJcCHxA2vo8a8aHIvC53FJ6Z/r8KA zuWDkYFcjrZyNFRMrSr2MZ0G0rkuZbkSLS2Waajd/4u5IpwoSFIyNO6A