# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100909104800-rr27pzs6rnqvwc29 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 1a8e9d3d91fdaa2beb4f90e62e24ae87a86343c4 # timestamp: 2010-09-09 13:48:09 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100909104404-\ # jfmd3hgtqz6ujva9 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfvH9NUAAclflFAwcmf//1ci FAS////wBAAIAFAEXvOwADtZQGhGip6mTxU9TwU9T9Q9U9JjUeobRHpGCGBNBqZGpMxCaaYgQNPU GjAAJghhzAATJgATCYJhDAEYAIp+ik8IhoaAAAAANAyBoCSQJoATRlM0SM0JtJqNPUyZGJkeoyIq KIooK478uLm+fv1I7sx+Wud4UsE5unwg/5P+pk4RQuLhgeABdYikdVdMB1ER/77o0sQIPUIogqWA jJFdDcYEY76a1TGn3YZKkWZIApZxhKpzSD4lINmLjaEIQkULYHhtZudzjpvC0eEvhM6gz7YtVCrA e/zrhnonhVZCj7q5TV+fT4LXaLP4ztfkRm1yySIcUi7bfTKvsiK/nbaKEkoCG5iHappNRA2uUYIJ LzKn1CLkFD2TKr2HQ9KI/stywLWWshD+51qDx9vkXPZ0VaUUvLs8/Bcj8Vb/kulPdoUssMeG1uoR Eu02Ym6wVNBxRKKdGAbvi3xRbpHkthVY+weQORNyvXDDkWV1Mt/dW/RRV3WywNrOYhBlnMteKsiW UDFui3vpMeGyJixbINIuIHEMrMFAijQLdLMTFiF+XBXXKhWWcxeqrvOEld1EcFdEzTSLrk4fVPMT 771ZlFwqNFB0CI8JbsplJUNZK3dWRYmmsEFbq73KswpcWlA1b2wWxTt3+lZCm5GFO2xnRyRdAocm oaJMJzaxV+30NnjlmWu8H8uzpetEiqdbDM3zPp5EKERqO2Yo/PB19PW8PTn4UKkcHE4Gay9V2pGv frzSNtmHtisGkDGqRj0nn1wf3tMx9akfetIuo/h/UxTCrxZeHHx2j0xIxZut2e4Q4Xl2gxWp4C6J /vVBcrF5acLd7MkUWpGmGDpMbmVpB63CFoug0B10WCFGKqmkEGJFjCExFLF2KXlKVhaXz1Y6SCGR 25VoAqeVc0jCsXzbheiCQ4nEBHNFOHTeEXqlYpiyTG2DApeQ2bkK0Aow9OBRTBtHc6MjWEDm32PV DfQScoNvJa2TKnKbgZRUORzUEwvE8N+/fGOq7NiV5FH2795/q4OXu+znN7IIrM2QNLkpbtO7c2of kgrfdosVJdLt4hwMrVqn8LOgNzFE8IVFZEZQx5W/Zk2AoD/KY1uCyXuDTuwl32rZ2Ljmm7Ej8ZBt BP4hWFbklzmkMe+qCo2tY+bmqf2gvNI0D6HsGdwoW5UV+TcKMTqlaSvkPFKB/jP/0oCmEgmygMLg 8Jj9qouFRAKgpZOZMruXYwmSKR03dTqjqc9CmH6SdCEndVX3SKgk9bnq/nmTYqXJlozJ5IJ7uMYo lX5ixFaqs89jMJj9YJLOMH/St83RQ1tzi+RiykhUr4C2VY0Po1EyKJJl59sKq+DtsJtm7UTThM2U BY4urBprumvzAAZR3AV5z7RsKoQHKIgxbwukNlMVNodIFopEMTRhYtVk6lY1j1XZiE8t6S3rfbB1 SvhOcaqYeSxNtyYPUT6+gmUDBsmWmmLhmYpV1BK0X/E/r/4u5IpwoSH3j+mq