# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20110310175604-0rnz6ugknebxninl # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 99c34ee120e3cbe03d393fbac273e350b58f5e66 # timestamp: 2011-03-10 11:56:17 -0600 # source_branch: file:///home/cpowers/work/dev/mysql-trunk/ # base_revision_id: cpowers@tma-1-20110310173404-8sjeb0e06v2pyil4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbLMvJsAAZnfgEAQWHf/938t 2IC////wUAO5eOlXcdE0OhKIieom0wTJoTCZGymhgCHqMgASlMptMCQ2SnqBppoAANADQAGmkJtT KmaahtGoepoAGg0eoaDTQA5piYCNMCMIwAAABMIwEkgSehMEno0IanqeUMnkho0BoGgXA+u2kzb1 0sTtkPIxtY8ILITOV8YKuFFCw1YBVoykkD20oNb2uVJBylyjC7XO5lvxVXecKF9/2Xovxjk9UYlp vCSPmrMkmlGSsQ4QDeVFMND97jPu2VvrmpEwkt0OygoCInyDfj3UW07vQbZ3JTXmS56VnqlqriqW Q17tnC/imBRQnelyR+B4rwjFOrB5mpgsy7Ow1xM0jxD1e6M/WK9nOBq3LWQFRIotEZhF2g7eqyuY jGMroC4Ky0rsI9xWnw+g1whpwM/T9SkRaq9pTJ8y10EuabC8qoSpMthZs3G3pJ3GGLw6WJ/s8gkQ mrhFF0C4HzhdL4DF7CMKg8qk806Y39PWHXhR84ZqbW0mYwJBaXDTNfJL1CRYxQRLLqKeVGKdgi1O kZXtcWyTQ+H8KgKMHDFxaD2FQXlrV1rTSURnY8a2klSOlEue0hdbUi8wNGuhjakGYqhaosoY1soy 0m0rSFUVVWkIEB9TGiShz3IYmAYCDGecR6at/aUjNzZ+pEEqJFFOeLo9y+XbX3m/fn+fbn2Kthka lawWAuHF6c1XpGig1bvJ4zIRXsahkZYDJjyWyoyvd8xw8kR2eVobp2TSsj09QjyeNsJkgFKNuJ8T QJfL5CWbhHvtjJcXdUZxYvnqduE5LvSjJgwWGzr57sa71Qmcp5GJZtI3Y8JsgoCizBs1jC7IbLJw p0Z3UmhkTgjiNHIGiXcXHe7pJMuW1chasfwwi/NJCipGPZb0+2b9aqIZs2E86xGXAcjRuPCpMLZN O2rV1wMO9VgqQ1ieSYCcFsLNSVNRP2FB2WgiI65U0Oo8QyB5jiHEz0i/mn7a9UsA5YJcQbdCviOD oytZLThocHMXskHn8HbQqD0cAtgEkPM6TFFTcMddOjiBRJ1gWANbsKckYvgl95yYqWCOiHBMwR62 /wSt6UGrNrJzKDlaLf4GwTzICJSMc3wMf8kwTDtcrNXdBId0GTMnESHJKoL5ZaDQEC3QLVFmVSQ7 fAcifVaUGzICYd4ujGOjLMJUSZWkEmSH2RusNjU0zB3MJrk8XIX1wr4NOpGL7Y5xnqDDm3EapLcb 9k5wH5wggoJ1qS3RPSJLCxTuUcwJKTIGA8Fn6RMQVLDGIbxZhaLyX/F3JFOFCQssy8mw