# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110228114627-\ # ew35o5uw84mnfccj # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 94293f7095a4a051de93c76e82765e6dd9da921e # timestamp: 2011-02-28 12:46:31 +0100 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: jan.wedvik@sun.com-20110224141651-xj44ji2qh1zvszek # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe7ktqAAAbffgAAQUPP/93IQ gIC////wUARY97N5Tec6yOpL3CSU0ySM0eUh4p5Rk2p6R6nqNA0DQSkRkbUZAmmk9TI2k0AAAMJQ QmkzRNFPNJ6UPTUw02qYnqeUNASSTUHpDIAAABoANACUKaaDQJgEaGqbTEh6hpoDKYuKp75l+jTh fAXXGFgJFhpPY0tkYh7Eznyhp5YqCqe/qJ2hL6XK5eQaDszMy/ea2dtsAZfGPTp/dZD9aOuG2nXb DRXXBXLqfGmRSsHlXYLIXcrxlVxY34tPZw5ZjKJVDyJQ5s0OodQ/5aaCGN/OwSqBhwtdpfjKKj70 U1BzwJWTJJhW4Og96CG1ziQ0MIjIvLCJ25EYel+p3QmKEEdLSDZ2pbyYR7ppxU9ZiE7O4pzoIUOA kxyMq3xzw5H42psvR7RPg/lHNUgYXZn3DiDLLaYYlHNGo3zMq07wTFEGzuTK+oxg8nEYJBHQuIF+ DAn3jDBJLmPFgeVcHy8RKoYVsptKlc3bKdhXAtYQRiXj5hkz9EzxrcIUmRAs4vTATZHamCVE8hyL 350XrNsTrS4TzEzdRIQFfibRMRgTpdg4ZrC221LjGWW3gVqIwyxayYLcgjFHZDjfqxpVUS8ZuEXD c6yLpQspUf/NNcTWK+9SiHVUaRHZ1lDKVatSydN7nyUd0WpYlYVTXmfPLCu5vJjV04xA8UyssWCM zcZnT5Oz0ivTkOXpi9PjtnCVpbyryyAuNWlyDbXFtMsWnc/FUOlPupRXvhkBTmaDTSMOm875YdYN 27Ut05XKcemehpy7iehHYuj4CUuUDeaIhukE4oFF91eBcP2psSRFqIkdEFv5hE/7cTVJvBQHbA9X luUeY9AMyai4bpPkdfBwEaBWqoTRmDVPFsvCxIS2cW9ljNj1tTh2dIvH2YvKwvak8IqQtV2UnDoN Nqsb0FWZhQt4Cqer4bIGMqxOuGKOG+2Jx0w5mUGTTF0sEOzC99xyTVg1+dyqNDPb+qQUYIiJ5FVb Nc902u7kmfAwQfshvSPIUw3BIKFnUN1U7/Xfk/MISAu1m0a9+AeS/NO1CRXxJ4A3gOMkhdqMAsYc myjNogeFbBWinvPADgAw4JssCE8iCclyMklbCAZK/ASUT2WuXeqF6k6iAFybEdIJELaQcO3mbrIz 0iVJFSzUA8eqOVFTX5Y6gtwlZZ7+YBhcXCttIkwJQM2c0U/wFwO6fV0XVUHmmPfO5VRXJQ8IEzEa qWSWdUrJEcsgYEkh19IoS0eDEyyvBU2X260k9XlUMKemdQ4m3bERJWVrZK9im9IA3s8CgzXjN/So CAUh4g7VI4+iUHfQL9ymAKsIHaVzIch8SjvoOltwfW5FaKiqFW6fHA376goFySZBmVKrjj+cjMnw YJAYrLeKZ1VdiCs3wn1pskSWoVyfCnSFdS08cZqqWhGiyLBErGs6kxRTYv8XckU4UJDu5Lag