# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20101122171116-mqhx1duqbhegu3ca # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing/ # testament_sha1: 7e3359482b69ef6351b3a2c5bdeb6c8c47cd14e6 # timestamp: 2010-11-22 18:11:22 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugteam/ # base_revision_id: davi.arnaut@oracle.com-20101122161335-\ # iayexmmyw79fnyvk # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWThVaCoAAWzfgAAQUGf/93NG CAC////6UAPNT1yd3btutrPe90JJIamBU/RkyZNGiantBQaPUeiPSeoJSJo0aNGmplMbSnqGgNAA AaCUjQTI1PVT9TbRE9Rk1AB6J6gZGIMqR5R6majIG1D1MRkAYgAMCUghpkp6ZHop6mnlNqeUMg0N ADJRad/z44ldnmPn1/DvOourbOBbdRBswfBC0LCsFJbPIwzP10NHQ4WzVrgh4SthPsXPe8PDy3OV 3U/yan4lBTLdLx7dtuHNOZDU38PvIe4izcqbpxVd4NHvjtMxmrdtAxV6Q9MqXuto8TPi36L1jqNE GiDdmxlcj2qRMDA/kR6pNNsHLeeNUODxDnoZ6XiPQJiOe1Ag6bLSVOlEZawwex4mpCJasR23OVqo P4iLNTCNdpvBLh6IYtL0CeONh1XaihhRsFgqN4TuT2SxL27z/CQzIa1dR4pE1rfQlLNKLEVePYZt GYWOgtHmTpC01kJzN90qS+405mVNAhdJYxiKS/AxjqSqqksz4TlVhBoGxMZ0YNawf6pSiXsjtIfM lNd0akS6jzlHW6VHVjZJ5SwtIrUdek5TNVlxdsWCbr2NgRJOFjc5GNZAgEbmczPlRJNUoMe3O+NM l0lzTMmPZ388fD8hv67xMaKJeTA/1IjhJISmJpUKVmdUoLO6brNrN2XfvRCaDqWg03Ack8WwJoxm KX/0wD0HI2LEWm5KbE7sd/XiYG3fg1MDgJnH9tfg5BoQSXeo1BQ6kXzqx1L9b90F+G8imhe5I2pG ahzZJMpSMZvR6Oorkkl7yxxORBaCfHHXTRgJ97zpX51uNxqGS0y2uIre0LSe7tn55saJOohLjwU9 wmcoaWo+HDznp4GSZc7q7CwbCPNE5wW9FxiVA/C8q+RqOFsoFBwWbGIFRxwqvlS+I07RQMsNFKDM 8SvPnK0xF11RbHMGV5sqinEx3JC0kHC67716KYpv+ia12hKtovNEWSLqk6gfNGv55OKjeNB0Q6C1 mWxumrFWinJAI3EXa+gKQpWDDKCIKNMlVEfOAJYpK5ikoW13iiFot2Qr1PYUvJiUUwnvF5V5o1rT QTasW1IuKkWDHsTcqE+ZMk9lJHmgnQzJkYhWcSXWCiJ2NkJd5SMQlR9XVsb6sjiPT+Cs03MyhNeJ LHch8jhQsCgUShxrWm6SYIUAla9cAUX1l0hRyIvW7gSlwBm9a3EG4ZyaWhRISBZJn3dzOXabC5hg HRGWr1Y1XrRekawXsrviKU6d8Cd4QCyRaaLhLKNbMPtQOeHw4SlcCi9ifoUp6uC9NpHJj0lE83di yNLKoZiaRlSVQaQRSLkXOWvTI/xdyRThQkDhVaCo