# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@oracle.com-20100817160718-\ # pjrpk8i5m8ux4x40 # target_branch: file:///Users/mattiasj/mysql-bzr/b54747-5.5-bf/ # testament_sha1: aaf2e754e1a90d0989ce8d9a2c57f4c2ac8ce51e # timestamp: 2010-08-17 18:07:41 +0200 # source_branch: file:///Users/mattiasj/mysql-bzr/test-55-bugfixing/ # base_revision_id: joerg@mysql.com-20100817135418-6u81wjwo3zdujqfj # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd4MOCMAB5F/gEJwEAB8//// f///9P////5gD/2777772+77XdtH0AADyAfcaXQM1nproaUgiNjCKEggCUhDVNohoHpD1NqPKeSa eoaaeppoAAANADTQBKImQZDUYKRpo9T9TUekAAGgAAGg0NAAlCJP0SgAAAABoA0AAAAAAAaeqRop 5RoDR4oB6hkeoAAAAAAAAAikIIE2poybRDFNokemEpmmpo20IE/SIaZNMh+ogSRBGgJoNAE1MKbF J4RpNMhoaA0ZMgDIepXUbMuYchRsfhS00zojBocbXlBKN0e0kdpTkGVOSulcm0KHDYZw9fEfg7Fm yy2qvdTXJfpRJzXjyUtppczYgzIew91SbxSUiSJMOsZOyJUhVs7ycLWUnmqQFv7FmGSMiJ2Qdc6p QM5YDCNtzgXt72SKpGCe+e3LKdlCrtw9s4/5Y1v+t9h+vHdyK9s4kIHrIwA6CuSnHhh2IlDIrm6K A+m7nMIPep1ka74sluwUPzQHFgWNQ90LCIBAAJgZYVf4SV3C+4bdfZhVmB8FUjQwLHjqqge9FmyU LIdgWiMMpRqXi9ElhNsyLvGyPwMMWrWMbBIyyNHitBCKhhdAmSWMYHYQFcq37RPZELVgeyEvCj0Z wm2mJvT0sO0ROMECo7JwFohtYZdzMkZG8MOQhUCWle3xo0t3WE5E0bCiJ2kUCJyV1hRvV+9RN/Ph IzhCDMidLT3XhmMLscsVzVnaFngZE4cExjVrbqFpdbizrILA1zjAquaX3Dy1t9SHtpksYsSGVLaE UdB2lTDl8e4XFhuWLYDyttEYQuv13Dkcmm+/broymtr6lsVAqnKODtTBOtjlXqXJa2Jra7cXGVja C4mFsnGhUfbVqxJMzLnvJJaknszIWWCABAUMOXFvOVqhMFp1IC+gZcL3IphTYZigehOd7BQPOshM YLpEqQogYTPC3CcxNEo34nVKbnsdWtdIqTtGj7i3VOfqXxqIR2smGTfM5XRi4wNd2WfpbNJZLvEw yCsAKCh7l+eo3Cis0BB1L6gUJYDnT6DI9ZQrrBj2kl1QWrzF1uuWfyuZ/T5zljjq6UNbCYGGGFgo VLJmNFmGkOhsPGE+Lrt0WpKWDy8u40cRJuZfYfmkQzDdsXU0gDMtrBBgIjvICC4dRfgBMY+VSABh UZICoUBSmPyUycwiLibZKyQdtiAseA8XR1KWFZKRUFqiQElMVcj5AeIrpitShZXBMh8Mz5ZkidBU F85yL++3YRdKuBCDjBY0oueR4+H11CQfsZLEW7oG/aZi4qo/HhhbWUOIt2wkUmbLZ7a8TDQpmLm5 NKB42ZFqBp4rLRWj6jSW2FAlcgPhYMAuIkeaiAoaeGUToT33K1KXXbbYLMwLRjHmMw21FoxpJj4m GtDnwnvOUUFEB6lqVui+ziZXwZm5zEWEnADRYWb9SVxzZi7nCM6yEyFquUZ4Fp22Xi3GhO5dShcW RLBb5CORYY+lsMei1L3q6S7FrU1s00Yza94FKe4gXimxr26QzGJirJWT9Ei6hKu7mRGlFDtoKbgn zGxLbWW94YdB7drD4k4W1WLLS5iQ1yoSqIFb2qCyXFfiC2C4L4FqsGRfuB0Bp4mI2ojBAVIMZPXs 1E1slYMiFm5EdBdzKdtdFW1xuNuBO3hYQDURXJMb+hdRMZDFZ29wxUlfK6sjqNGuQ0baiHvX0C8V vCVuV1/XCC5KArllpHOrUKkxsLTexQC+jFx2wyXAqnEQTTXNn+1VGJcq0AygbTpuppK1a7GnSLqr ChNcJDGy/LTaakUvwHbAmmpZegxYzFbRl1YVE7WhgaDPAoKHjqFireWsYHJiVChPkKBPzCK06pDh xgetT3FzE6llVI2risbcpVmwUC2dkmFaApJOYIDMddqwKjVQcGVYxZY7Wbc9OJxLEZoZV9NEnwJo JWcuBsti9hgFRA7q4rmqL2LeuS+leSqML82wUWimTMDDJ9wksjhrVRvJCxHKazmcGLTukUN9VCMX mS4FuBjNIrH4FxMq4S5FuiqwrKzagHNoZhym2B0K2wI1wmLvwURRDWQ1HopZYbC7xFbtiJxbANzb DitxXi5YYheXk2V10RkpuOO1o2SmiwxGqIKZEFqgk8kqnYggmk5MZwHcg8xCUqgw9YJoot6zKagx hV0SIbq/y45HSXO+AEd0JjlrMhexBB2pUEyAIcP0JBtPNh/LlcCLgPYj4/ceQcJ0ByB4n4ZHQeQP 6CeB+iRN4PwBP8J4mI/GYazFEBCREQRmDIfACptEmMx8+QiZAqYYkgqnyygTR+QLk4jJYWEF9xec R+6cRQC/9hwnEJx1IVIYj8SK0tS0SRWJNrFm+Rl0Zcp8A/jMsSgf9JhAY0cSnMYw5msqMXZnPvyr QjWmBG4L0TSlAUmC8uA5IDxCA4ZPAGDRP4iglxoUkeAfpMvycopEKARRNaH+hGQSNAyOY1qiBEps DSBDuLiaEMbgiiKvNZkjSMnZmZx31KaJBSRbgqEFWe04qtF2hMbiiEWBaby8RgIfLA+LEf8BnAZl UOLNOI/kyyESkGpEQWxwctSxRIC9y8CCRgCKqwRUETYqKYUUewqoMmEc0JjNal7P/FYjJYDhoKGB eI4rFHpPcIvDohM+8fuO5e8T6TrSRB60hiEcBWWSEoFJpJKfCsJq/KJFSVv2Fh9qTJNT7NH1QkFf txi/0J+o0VTHlKD0tKy4qPIcFZJLVELxUcfHRigiSTv1isL6qSHKfDAciB4+swraJ968D+Rc4v7U zFEJEo1DgMLYMGOdJGsA50BwYGALSlwOhKhsQyeo/hNMOjlWiB3jCSkdDlqw+xc1j4+r7DnqlTyW Y+askTFvEjKSOExXI30GzQ66FJhTIBYpLittSHpOJ9fNYgHky81id4iZY2tOJG1ddroPEQ5nYJ8c RjdwQGdxyWZ9pxKEx9459pM28L/3pLT7d+Wo6eRxBT47SNmzrTYtC4cRDIgki8/IXCBaUMRw/LBJ zr1ZOrkBYsABxmYZMxfB12tEFGqwYMFFBhmhihcSgP2xQcOzCBMKYD3VgEbmViCREtJiVyXD4eW1 F9DEjhWS88DTrEPGBznpILFNglsfzXoqCBUrKzKpQ9UZa93qfxnugEGhNDDDyY1EesnK+sNcSMPR UOoMmBhJeQMjB67XLDFzx7B3e/hQvVfdLndc8dt0xnNRdd0LS9zFMydRQyyYglmRxqQmE40M+X3t 1K0oJyrPdEZhXJ0y3TdzPS7wjhulEH1GsvIlCJUurGW7whgmka6+0s0OZ+pcGPatZpIovNGlAUsx PRocxWrz/Uo3ppAuvo74eaXH1FqlsBshLhhS+3FtmFgETvXdSNxNeHj6XlIvsWXVzIgekuS0F6Bx sMlMkuiGXiRSOz5mMigJr7TBXrW3c4/gg6IjwVS56bDMT7CRWbzcbjCtWSWRejlcBm/ZOy9ISacZ 3PWF5XVakNhhN4yNDktTLBsY25mYzOdkJezDENIUlKLWotrcDuc1RzT0N6B6NNja1HK7HlY1MScj ToF6SRfW+gxMkfVDq7JNiRdMKtZna18+JHZkJGjEh0oG4axZuk7CTIPMbJgByvcdh08zYMkonJQP Khkh0qb10Ei5TCdjaOW4Q9sL6iz2v7BqB9zYMZMt8vE7DAgleMhkmEMZVCyWrikN8Bz+FpuQRjYA QLDaWjo2NudRWKO1F2vUHNe9DucWZHzPA9LgChhQLnifj2l4nXqeFAtQNTlvwhpRrArYalNJZMe2 KxsgT3YzlS3Dq2nS+gewIhdCLJWTDBkRgN0uDSc0i25HkG1moOLDSKi6RRSUWakoQpwLCxKCvdf0 dfC+0NbBWAF66rmECpHAXyHyCZDgw7+kh6cUHfIDoHRQRkrRexTqGSqLlHXbIbzXDwLKMbFa6Znt d4sn97uMyWYyDcmEkOECaYKI0iW4CxCpZER4QtBKb0sZEMwaDjO1qT6AqSuxCA/mczlcuVxhhVcH hGUghiEgnEhiEI6AIH5x+TVf3r55IZo6TEb3vNrgsDzhmgGSS/N0hQ9PdMq9voATjykNRAmAgokJ RFgE6DLAdHvJoSfqWFPa6iaHZl4IS2CICMRxZZ6gztb1/FIQbb6ivpEzErPIZDIOYjy9UHd2dmdH bUliZstCjANgSLPRrnFfzlYdVLLkrzUtvggcrzvpdWlVq4W1zYS+RIv004KgqLgZCSRVGEes+UoG QRoxUz1vDBBvzDBkb0FYA/X3O28gQSoK+erfEvRasILyX9crfkutWgOIWILAYTYAXsDjAD0DsXko EmBpFY7sfiH8Ue1nbrKBMHHQk961ETJipd0TR1S0VzqLDBhZDNpCwNUwL/6wzhiKkqrwKWFEnP5r jNCxvdzzYeFV6k3xwSlKUpZXSsmc2lJzZykymcS6FWC4jWwEGNIMNQQ68x4+CkI0E/Gk1gEDiGae 5Tg7lc/dMrKuVc1xumTbKS1iIPb6+/AkiusKsQ+MRiEosrUXAMwzEF7AYLEaawZVqkWDCc35HrMC Pjjt4LRQk4hy5DrzR+j74INzI1h9o30KslkAGowDaa21NsXgw6SmAVzvQVM4hxT0RyFLIQtMYAel 0pjM78+eIvGjOfE8z1Y8DX2fU+sflBylTa40DvQNTfcWF7wAQZw5NUTqsBl7taEx1NZrHS7jsfUg e4MyOo37SZjukcQzk4uu1TjbKplZBtbj5DukOG9PCed9r6nqYdbVS3mfcGwJ8HQXGs0mdmJoIIj3 mxPOTo9OKQfyazqdw8OJ784kv4Cay4npZuB56h3Dl1mZMwU+b8z9/ZP7z/4u5IpwoSG8GHBG