# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101202085117-\ # p0jvx59vy3irxyvo # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 0778a2694aae711376d8f02ea8c35bf74bbe4628 # timestamp: 2010-12-02 09:51:21 +0100 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: ole.john.aske@oracle.com-20101201220042-\ # 22mf7mvxdl7q2t9i # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbqHr7UAAjFfgEAwUOf/93q3 3iC////wUAVM68008dby010evdhtCSSmBPU1B6j1PKaaYmIHqPU8kAAD1AJKamRU/00Tanop6ptD U0bU0aGTEYATIZAlNTSZNRMTQ0ekyaMjQAAANAAJJI1T8piCNqNPKaaZqNAGgGhptQACSQg0GkYg TZE0xApp+qPUPUAD1NNGs07F12udRCtX5SSKUgBuxYIwhCmp3IuFNl0fMmRzYNDfFdJskLHbc0ih YDSzQrzSm+KM5T2u8sD5RlLe5ksSQ3v6BXGV9RHL6aKgsNUIVb+NOXLXaHCD7CDUGYsvi7bA9cw8 GxRCA1v7eCFoOoCQLHFc6Jqm4AnOVQ2DbROJeETug+ClPzDn1eloJilwyGmIc6EhhHHSqu+s+BEQ +Hx0eJGRj1F8UZY9dm8NVMwdGdsikNe06QxockQcLY6yF/2VBOKtglzgpoPCVQoFSwKQQwMwoJOJ b2N4sgPT1sO+hTrmD3C0JmJNLlQoiPJjIy9KYifB8wi4YNNLsO+8ZfkYVTSFpFiX5PI+0cPA5vM8 SnulANQN+BcDCKiQxrDIaZWzEiQIsV60QZp12O99BxObwg69j5g46F8PIa+OzXtGK1qTh0qcFnR0 FPqFLXWPGqWOsUDQKBIrKjhAtONz3m0pjuiPFcqqrTiEeT7z2bYpnQRpjPQZ71um0syFVSxnEqUU kn3QbgiLL3bUnmHET4I1mGCak2uKg36w2J88nYzfVa5PLcRS3NGowlo3S6Fl5eo7L9shhXIzNYXC kEc6BfN0ouhcxQyISJoM8iEItnKbsaDkpVemqUHpFWtKaSdhhmDpgjqB7w8kvMOmqAMH8Xh5JEVI UQ+lYW3hOBFL+gqSsgDMH9r4CqtLwDqsN2D2Q8Hey9+uJTKOtoA/tVZXncy0Daonl4ShiO65Imf0 kO1CFnbRivJ4hkYc0yHqhI5Tda6THDZaWWmMwogyOyzC/TSIdys9QGoI09xQik9uXsT2YGWQ0SLm SM3hJIn6pveIgnOGzx05fkuvUE5lT4E9WutGWZjk8IFTLM/EJuZMDFv66zoLYL9Gnka3uBrQ33H8 wSRhqZShi4x26+UQ89t6Rj01M6e0IbTX44Be8JqTPg4cXbjU4UaXcEcbU3uHyB7plarIH1O3qs1E 9BBEkzxShngoSV4MXkS+2cPKd64TrCv6dHdja4882eGD0VzBnNvEMYhnAtyZwf2hPN0FfSgU3srY NfQm6QhzmRUoxCBjqtkjyCAPwD/t2uEAirchUo3g+5cKPPfA9TseiRUG3Uegs7WsBTB2HHhxBwXO kDK5uaOYvucVpGSQ6ANnuuC2ygS+XAk/mvAq18LTcG+u6E5EzEE3pTLQM7lB1FmIuRBMlSocJGiG +ATpTs5E7w6hOFkg39yVLJlp4d4Ym90GqD03wDaD9GQ5uGIBYFyTKQcdx5/tI4gmuFlmB5iriF2c 0G8KqpPwsytlMBmCewjp2X3JhZQYL+IcVzKhzcHcnUvUgDzM4L5k1ArPlL1eTFFSy0Pv8wnnmtE5 aC0ezBEJobijGTD3FjwCkHftUkWFSy7ePi1mRouUhgLgk4d9UtJeFMG2Dwe+MwvecNrjeEaMyjcN WJ+2fT02fSxmZtFYzUVdLytWhJXupWyhJ5RDihqsY+9uOOFRpCYNVrEqBsGh2UW5UDCsFAO8TXIl cAZJxoESBhQOFtPIE+MUMNRH/i7kinChIXUPX2o=