# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: john.duncan@oracle.com-20110427230950-fjxiqdzvvg03dfw3 # target_branch: file:///Users/jdd/bzr-repo/mysql-5.1-telco-7.1/ # testament_sha1: 6ecdd612cc52c45c431947542dd76a17bfcf6681 # timestamp: 2011-04-27 16:12:06 -0700 # source_branch: file:///Volumes/Rugged/bzr-repo/working/bug54169/ # base_revision_id: jonas@mysql.com-20110426074028-xozica2rmkwt6i2y # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYQzHxAAAWrfgAAQUHP//38x HgC////wUAOdeeiM11g6UEok0TymU9NJ4p4hkTNQaDagGJoA5gEwAmAAEwABMAASkmCamj01NpHq aTTEAA0AAAGiBQ0Gm1H6pkAaAADQAAEkpqaYaaTEwTJNMmmhqeoANNBptR8aHzqj6joiiprgAF5G oywxUZ7IH66BmY6TF5Y6iolBTIfJVWb8pk+KbHZF5MQfPFR6y2LemOBgkZVd4RPOIhXxooF5mGWw 9NdGdtYXP3tSGaUEmyL3UaMdT9KGaEICdv8SMZCb86XGIT+goqyQQxK4oBuEgolpU5CStmNBiufa 06XCGYpqaIVLxi0vfuIpgW/EJykpNN3HcPxNlmBXTdCIu6Et5EIoLRPwbRNEGthSBZFKGp47ZQVh qDwRLmJjRjLQxeXOFLPM7uVoTKmhRlEsrhFWGUg0mnWTymdeYTRXERCMlN52Emx4tNHqNC56TsYL KmhXVQgXa5SFwuyJZKZaMuC9hhC9ZASYRuLXhHGmE3wBRBT9WtxPQNxPsvaMZS1tubhrrtoj6hLr YkYqlORN0EyrrauCnEkKhj1opymjwe5XVRtJrM0e++lqjt2r7CJEpxSKKq/LPeWS5g1cOHVAY/Hh xfybHDsmqlE1E+DS3MQBsBlyuNhGa8R/RGFSJrfLAh7q6vnUBH563okDgt2UO/mVHOcgaDHT5FsR vnOHINDi3RBWE4G0yy7mw5VVEcafNEMl+m4e+Z2konZl54qnPJs4lVpGksBz0NAVwOmQi+AlvAGA 5eJiGERy15NwUPehqL5ITGUrnbWpZMrbKnqq72Ezj9RUYaKGFueuokCNRQWBGU/qzj9xQI3Hd9Yu rqxWC68RQsMy4KSbiBUsLzaGM9oNbU/km6zazHyZOMPQKvhwNt2i8MxVBudy8TC/zN4z6GCwW/cW 55BkVBSjsCsK4geN2j0mN9/+2yzNIe3cI6JsVPdQVaAjjjGb2DS7nGMkxEk3BgpAcRhdmxGOvtRE yZFF2NjvxkksEi8FhpY4yolaEE36kyU2BnwSNFKRY7c+FHWjaxah6GHGkwtE8F8tEOthIiG6s5D8 ucFSGOEd30PUmlCkJLrSOpdj8AaRc7e3wbyROZJ4Pa41dPE1gte0nnKoLMqtJtrpsiYnPQsBqkoo z6KeS0R6eEUenQWrAOIq3iuN4Tl3ITBKsdbMQ4BwO9Gqa8NQbXvLhf8XckU4UJCEMx8Q