# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@oracle.com-20110622092335-\ # ld6dzg6ax7dnsovt # target_branch: file:///data0/magnus/mysql/7.1/ # testament_sha1: 04ef243906d147a4a0213ed9803371b8569a1c67 # timestamp: 2011-06-22 11:24:34 +0200 # source_branch: file:///data0/magnus/mysql/7.0/ # base_revision_id: magnus.blaudd@oracle.com-20110622090140-\ # 1seyodt8piwv7og7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTK6iNgAAhvfgFAQXGP//3/3 34S//9/6UAUMp5VDQ1hBtaiEkpqGNBU3kPSj1M1R6jTyTQxGRo9BNNmlBp6hzTIyGTBDRhMEaaNG IGmTIwABBJE1AEDIUPU8QxRk9Rk9QaaaGmgaABzTIyGTBDRhMEaaNGIGmTIwABBJIJpkAmU2gVNm qZpD2lAaGT1A9QaaPU9Q4HMAykpt3jeW7I0McgUKXFLgUG7mO+/XxFuGWpB2vrlqnjI0RmBA4Ia0 tPXKxj69xlv3jun+Iq1uazny9uKoSrzaGZg7voaoqY0sZ5pSeHfVIlabM7MzHEtzV6bFHf52cWb2 P2nDAoimljccJNcPfeYiUmmr7HZNqzmbbVu0U6aVYVcNvpIKGcTJGMZDMKcZOwzOHVj8TxL5ju6e dTnDBsczeppUZBXmgRuIBa+W/lFyTHHts+Kq5I+/mYJE7aPtvil10c9PBzjQ7+g4FgQ+cMhk94j4 yMmETUFFm7igQZnlnHQec6xHwL++Ij2yiQ9g+DPlitiYITxSX1Rc1rc1i6dcxZhVforx05g8zebc Nd++7dMFsSIsS53iNhJtxVIVho+JJOJRAa4z5Ituf5TiwSyCrgzHQeF8nDRKbNhvrdpWgVDajcmN fLF5jiU3J7oTqScTbEazr9AcYX2vM6bJSLrrBDVELnFU4oYn6hOA46mV7HZcdbZULaJ4x5itURto ZU6imRtpVbQi147Z2A6Yb1qOFwVuthQz7OD+FtMdzi6bVMht7iuL00miQCqTT+0ywn6uoe1XhEkf rnOzoDYLpFbvZjajcjBekPEUlbDE/MHSeSPETBdABwsff/ZT95NkSP6M8woigq4EYg3wJB/FWFyR pJmwByL5fmG0IHlATFmQiaLgNMRYPP8ENiIiLyJCLzREwrJJFhNExpyzyt2jQRKbmD9XoMBQgUGW g0RdRo9IrrPFUWvIYnCgTjh4GOHJtgDq7ZDJFeBuk7IDopKzs3nP4T/T2JFeDkeIlVllD3nhMSpH 2P9qAoTPwHkEBB6ByR5rGLX1a6Ttox4PApCEkPv3E2LP+Uh3g32OdlmJDRWrSc7zg/1m98bQRTF5 C0nj8QMKRkEsmX6yCfVykNV2Ch93BlK1ZoFonVxhjXpSIi1IohVyFwp5dSM4ne4b26jYnApNlURP Z7+bTc00VUzEyHlOn1rCcsLdkjOy4X3xbjk4gG070y0PSglF78OMyQdJKoIcjnv0c4todrGXnt1f nePOVGtqU8xXh2ICBNKpmGSMgYr6QVlyIl2hecnWZfKmlmWFYPLOYW0wGIdOrKqoOAcyUumhw5BX LMr7thuUAx3BWFk3hJAUOtI1FwdyikMXl2frssvKCOoP5Ogzi1RVKoWmj4QdN9lE4YpDlEBRlgkK 7UKgkyZlypDrXxriUxeFVJqDFjBSg3jyRRjxb0hkTizxCqyirMpY7HcgzuyaSAgvTlPjCYs000zq 1rGdrE7gGuEDmRV6KD5cK1StDn2VVRDpUhyZceJNIzwjlO70jDbVk3hncupt0hKxYruYWylAYTFM IKh5WBbYnpgH+slWV8oFjYFwSh8xWPHVVjzC07XkGEzJDxtbbiyJEViHpycJzARcpb9na2FaRun3 zSLOv5AknwWoYi04RIYhbWLad0VdntYeDlf0IV0kNcKn/JAdfwOupS52TJMSkBseYj/i7kinChIG V1EbAA==