# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505115011-f7zr3tgzf8vpkqhd # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 2dcba3f1d407b44a635edfcf407d419c969d69ed # timestamp: 2010-05-05 14:50:31 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100505114513-\ # zg790p5lu5u1eie7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTyjRYwAAaxfgEAwW3f//18n BgC/7//wUAPDwGu7NANmCURNENGmkzKe1NT0EaaabUDTRpppmoaBKlDQPUbU09RpoyaDQGhhBoAA CUKantE0U9QPU9TRoBo0aA0AAAOYACZMACYTBMIYAjAAkkIaJkwJppNJ5GJqn6U9pCG2hIYPUvtM SzPbu0vfltLv9Nq0ucjBUYsU8jYAKnMqkgljzRzGy6qqb9xygh7GGh0DGyEP7un1a7vasUPPhgKZ mEFjDgp3/P20MOTHnyVGOpstSsoAZcwtQNZb1WEpZv1OL1fVfkoGN6xEfY8CWc0Cxb7tyDNS/vqZ I8EjVaQ37pfRHWjNEWd9L3Vt4wBSweCcLacZT6DCICIEpdROsRw6BiYkxf5QKSxwVWIhQL0g5pGS OOY0vFfxvERvkIwttx6wDkcygJmE72L7oc2yHRHlh1D+MSooK9PzZIwh0PfHTkxcWPNhaPD2BxnJ SDDA80WDgnwGLjtMwxiKbXfK2Y7SwlHinOywxL/WctOtNG6YqhJ0fTMKQEUYg41EKDzUczXkwxcn kKIFrFY2+GAH3K1daxIw2icsgqOlhNIoChfRSEulwlBSClV15hTtPUZ3ax5DGiSs/mQVpSbCQyCZ OLccZysJq6tWZZXIpRIzKBEzKscpgom8p27O5fqTIMvCsK1DHm0lexsTCJrGzlKIcWyqinKMsLeX FDQbVIuPONHzsS/mFqbSwOu+kMGi8MjQc0jI6TZGvWkd5XnHh0SPSFpPIqwooF6zpFrLx5HIvNZ8 i4w5FVWvyNoPYDja/OUKyBzGfOdw5cbRopk6mLKlRBZIhjZOWntKGDCJcUJ6lHRFqJ6SMp8TCrz7 COff82BRbUON9YWcO8iaNXBnrMMFP6qNt/hxF9QVT/ZMhu6yuS8xDOYFlEpM0zwHp99BUuJgQODz 4C2Fgol4RJys9+7YR1uXGnZwYaUMNxFMDfXWaRb9h2B+U73FuseXKNRThkuovgEo8u1A80m4M2X6 7HyYATmIHd6Q44H27Ui8MQXEWiKZIxikNzYjt207Q8Yy96RzSLPj3LmOTXKYq4w12GmmagukIAdh zlUAgzg2dX8DfqQ9kMnbgT4e7X+qyBRA3QR90jiGZd7lK4iM7w6Zh73pgcXA0CXqbVoX38qBMVLx gixoiVJx4hNimbWtVKpjuCTSVVwPJ0ioqXsjiqxu3tBiZgAsU38SWKRCi1YY645E7ORx/085NbYj 6BNW0gOE6Zk9la48QiHn0N9s8k6e7yvA6CznD+q5FlZezNp0NvyiPE/WDvkUYWC/Yu5IpwoSB5Ro sYA=