# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110412114017-8xpm0j95y0b9eo05 # target_branch: file:///export/home/x/mysql-trunk-test/ # testament_sha1: f55b483b704e7603d11b0c0c6d11cbc9d8721297 # timestamp: 2011-04-12 13:40:23 +0200 # source_branch: file:///export/home/x/mysql-5.5-test/ # base_revision_id: jon.hauglid@oracle.com-20110412105959-\ # 2h5bs6nps46pakeq # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR+Z5CwAAYnfgAAQUGP/91JQ mAC////wUAN6XuZbd0OO89uGSIGlNo2hNT9NKep5PVM0mjTEZMgZQEYjINEnlNPRPUaDQGho0GRE wCajJNqaYTTQ0NAAAZFT1PI0jQaeiGgAABoGgSU1NTTaTap+qeCTT0mmJmo9QABkdbmHnXMMb7Bl YSLcGMInH20Nc1Ywt10REA9OQ+GuTJFIGo5YUG7+0/Dmrwvl0X2icy+yqJXVB1QTStuotrdZuKkI yweJhpBDy7CcG8PtmureySNGseSVkilGLqsjBsiJzIgYQUsD747Q2ocpA2EIUm7Q+NkLzeDdJl4o knGZmfhOYzCJK404QziLZVlAoFEOJWgtp+Xq5SeF4JBaeITIb65kbawY6DvdrYGKFcatjcMKqXBG y/EArWQES7Mryx0LVAVhwSwPMKohjMggPhEJYLnq6DNLZMmGA5IXkCV7DneOgUpwNWB4DiNYk9U0 D6qLMUwEbLn+05xsAwjAQg19xiVUDgcyty0sByxqcmDhVZ1iUi3nh1HMUlF0I2JQ4lalZX6yzhnP ROJnNSORBu3e3WW3UWyGn0TxwE14UDWGDnqRmKsBWdhM1FRYagdK2uqlGDC9HAyUtUo5GiADnp3i vHbHjaFo7jmskRMQoOap70iVrAn0SEbILD1AVCDg/+37yRCCQFHhOMaG3b7XEbgHWoUijkskNRrt mNKxeMdwPcDGW64PQ3gziyFEBAZeBIBwzGOOWKUKJGXuSKpRJINdULJZK5jIWqiBLxoFEBFw5bKU JGoBI7fnNKsV5s9XIqdgG1WQrGtKc3u1NTTxZc2tu5Pbood9QpKHaDoNtDtT/S9oinAQqxywFNwC hEJgzcOt8GSvWfJESPAQIjxBRyxCc7k68LnpGiqaocoEOi8jw78kyQ3CGspTEdgRf99XS/PY5ycb glsfKzEUA9T2HNVqpdTrWkNGRUEQmYJgz/29khw7iCgW7dVPmkcBO5bVQ66gw1v34QeIJBxahJot Q0BqJvVl3I54vEiHoUMaUMBlcJgDXEfJIQ8YKGyhJKyRpAU0KbttBMtOB5nVCjA2n2C+Oy6AEDIC 2+HsnQqSarFSER5bgdniPlXxng2VNLEGgLMSuxsQInR+QCKD58Gc7leCIF5EBZE1C9irSchuQbH4 7pjqxuWYFQJvUu24wAORc+HC4qpVgMXn0KZPgtYtu4hbWUcz/F3JFOFCQH5nkLA=