# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jonas@mysql.com-20110127140839-yzcmimmoqef56rmp # target_branch: file:///home/jonas/src/telco-7.0/ # testament_sha1: 893948a98ed1a7a426b5a52ea23abbbc6a4682e1 # timestamp: 2011-01-27 15:08:48 +0100 # source_branch: file:///home/jonas/src/telco-6.3/ # base_revision_id: jonas@mysql.com-20110127133104-xkuu2x79cxsu5abh # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfimzwIAAXvfgAAQWGP/914d nqC////wUAOjvDuvZ6DuFAlETKYjEZojRpNT9RpiaT0jTajZNNNQGUCYCmBqR6h6jTQaDQNBoAAk kBqBTyFH6JqZH6JPUxGmQBoABkVDRkPU2kAxDRoAAAAAJSTImyNTKPaQn6ao09QAABkAeoosNnD+ Y/cfZSFlFeJAsc3LFG5kdWD708Myiqe/sEvR0YLjUoV3rX0P7Jx5NH9uWbRVLL1axr2mGVhK9J7q 4Nut2oxUOdxeO7mZ5T5EPmzOd2SyUrhpS8R+mLYUWPaXJQiCwMpRWppMMiqGoCJhIahphRJlUGVD OMriseJaicLBDpcm6X4uEJl5LEKFWa4ag7S+YT6SBprspxnKr1mFCXDnXKL2fxGII9ttw8ZSiDXz BPYR1DYGSZ3phOVVBrFEHkGs0YqJxJrTflYUjB8s2ljRiRUVoChQyVdxINFBaR3q8ugaLNzB7SC4 FclZs94jhYR2XwOVsxXIKmxrCuQpYxYzX5GjjDFwOErp41giPM+ydmNo5CxCWcvSCFNKVvLyVlbF gPUqExFCijkzaM9j1TpVCUQanBHDOUqRC4nMJ8qKnBoQYigXfYOYnC7JpuKBhOKarTHCrjdZnwfM 5ZrTw7OCRS1hRePbE3p08GdX4OXbrLgk7YHNh0l+vrtPlwZENqQ/cQoeXixOOtPOSPiDOOLDFvmj Qa7mqIaiJ7PTw2TTb6t0B5uab3SJvMBx4fPMZiNZieDBRahnl8caEccKvo4bgMLpIgusLrD0WnPn JoQI0elDHIoQa8Z+PWp+otJPaupV5W1ndFShbflx6FZhwhH/q9E79d2G+RS3jyEgW25K1u6sJ5t3 NpkrRiOSi1nfNdpW5yujEalQwifPlMysRNql+ofqFJ/rw791zC+8Xb4oLKYaPtSGUOXwZre8mXoc PIrB6Z9MFsxeqK+/Wprz5Ug8vEi3BRw1WNjDZ5kbAWSLFgD4NArJbqIdgAofByAOIEgJJImjQdKF Ju01TOd/QSJl1sQ0WW6shcZCdDuQxb+JFXDJgVSIV2J5y6dHPIQurkyKsmWOrVlXpIgqB/f8kd1C oqOHb1cr1GSlse+KsFiomvysyaSrshbvhOk7Ki6juuBcS6e/aKAdjHjJGFMNInwLPPZxGXeLV37q X42PwMYJt0oWDJD73stsQISVABLjoxdq1IfrJCywxAwKK5Lr1puwHaG2xtHlB7ZLKes7W2xv0cup YEAkyx68lxGos9905Q5lI0T7LkyLyuHxbX0LcpnJOhzAY2npSKimZ7xZkf+LuSKcKEh8U2eBAA==