# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@oracle.com-20110622090140-\ # 1seyodt8piwv7og7 # target_branch: file:///data0/magnus/mysql/7.1/ # testament_sha1: b1f9f01941d87bc9ae52722148dc17c2b67e1961 # timestamp: 2011-06-22 11:02:52 +0200 # source_branch: file:///data0/magnus/mysql/7.0/ # base_revision_id: magnus.blaudd@oracle.com-20110622083640-\ # oe2b2k81bxawv51h # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXnoe5MAAfvfgFAQVGP/93// 36S//9/6UASapKbN4k3QazgJJJojBMCMg01TNGjUGjQADRhNBkGSJN6TVH5NU/RGo0aNANAAAAAA AkkaJoFMaaE1N6k0xDQ9IAMg0A0aAOaZGQyYIaMJgjTRoxA0yZGAAIJKE9SNMiabU9Q0AAaBoMgY j0mmJoNIiw35oZvpg5jDQLp9kCOZr0L3ate3ZbVW9HeF2cQQSb6Lr7Dd19/izHUs0mR4F3VUyGZd 3WBn74ZG5HuLW0ElGTxZhmbJK4bnFw7OXTHr/kdPZqhi8BmPxSq/7iz4Q414/rIL0qBkWJE6GLE5 y866HdDUKUCc4hFJClv36Md8ai0XwWM/UIydNxQkUiimlfIPSKFpQOmoecfMMCcjyCaN8VqdBkSV GSsB1AmeGt+XIvSN6ukIxjdQymQOCwR2G3vSEQjAtGwMaOk4nXpM+TNYjps5JJ6CWtS0xxq0XgYG i80QgrakDVnAgK9SDAor5GLkNMYhfxbVQ0cC0KpX2xm5dcZ7taaEiPNWb5llZXrhXjmlmJyFJVQV 41mVWT7nnIcu3tRi7b5AUWiSi2yJzlesmBWHMgIjKTJKTpNvsfUJkBLxiFsinmBia+AdBp0lnIMx e1SpNsha1tOcnqhqhepbhZ621rMvJjszzw3655KNV+InwLKK9ZRiycfPa0pG+PjvleO0r+G5pjA1 kBpsmmzlAnU24zVaOXAg3c5uOIjr9zAOS0LMLSjIY8gsoPBSJFi04c50hfVN2sZkwTBhxIgDIHAV mfGSrB8WTILKa0Bo1lkJEiYZUIfKUELhnVAGi2rUzkjCTCsA41RND6AcSAitpDsgSVQE1cFCpYDJ FCinW6gRZElUDieAxGwUpBgpCnOwkCoqlSR5/GjzCqWkz21Arldh32VoRxm294a69Oa5GBipgX/U 7e6DBeql8l6y8XfCmlIq2XoxoVM88UXyY/xTyioxKoQTniGOHStVv5jUnZrhMg0UW9Ii+y+aDYVG Et8i8JqTx06tYFjvqWEiYJWe+tJVjkssr89MY3OOHUcW0GYIwBuWEqtBLNplxS3GL+1OBQPVTpdm B3cu6HHlZ08zGRHES4gbp6IyjDTGaJGfd25Xt22OOa5udMrjC93FXdo1zEYXPjWUUOW3mvxrwhNW BQbtPhhVAxvhyO48yijpFxgFqhLQcYkbPAnAeYXksmbemi2FIOKm2hLJ4W0vqDENm0UHJzqox0DK 9SvDNtvC6UOEzwlXMI2OSGJq8Mk08wjUWYzjnkqoqKWo0w0CKIssRBtMQBp2IG7WJzLgIct23gLF ojvFTGnuzeUWeCxCmDg7U88UhAiJxzaUjfF10rkQowtFFhXeBfoOqUDAVAAk0ijFSKcNdTai18qW Xn0kbSuBDq2ycIZAUmkLgEU7MeKxWRTUCvRB/AXFYox3FbW0OSagNp7VpplWixM0hloz8jPvWiKY 17rBHC5l3UFCS1hKOMYLMJ8lrJeJldn1sWuLYr+clR777Bqf5CXQvUdAMMvWvgop+mDD/8XckU4U JB56HuTA