# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101111093909-2e0ttrplgxxno7ph # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 148ceed4f2a29c5796743fec9a191070a61a677e # timestamp: 2010-11-11 11:39:29 +0200 # base_revision_id: jimmy.yang@oracle.com-20101111053212-\ # lo5nmbn8hnrjkwm0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWtS+QYAAk9flEAwUnf//1+j AwC//9/wBAAIAFAEuXujjNN3SSTNR4SSRPSp7KeJMp+0U2SaPSR6j9U/RQeo0aNM9FAlIgYQ1PTU 0TZTJoaAAAAABJEBQeiGiT9BJ6gPSD1NGQxAAHMABMmABMJgmEMARgASSJoamRptTEGlNpianpqa GTEAaAXJECCY+zuPA2mrU8MOECjOeHadZTFluMN+USsWnTdKNd843vx2FjIMzDMHh8kW1yqxZrr6 Qa9xmnmndHG9unLl50QZ0UdDH65x86n1F83pEiLc+IJ9G/sR5au0eUoHMi1QGUxLjdkhNaQyZoi9 ELKB9hMKONQmR+GvUksGQf9filKVIRPDFEGI0vITUls4GtSC3rtEnoWoTcM465y3P0Ydq0irgwDw I5SZky16yo1Om7hUE6sUgIJEiWdwVsM3tjuyoXvaNt/6MOcEidkhkh8zhcyxeNdUJFMsCPoEVR+6 4F0MDzFgip0et4Y2NZcMLDZakWYLtqE81luIPQiOZTGVRUtBG34sM3aIgPtsBpu3cdMCtdEyT4aV eRRxtB4YExVwAqmFuKlpmskfujyyXhsZ76TKSOE4btLqqSFaNaogleYSBUarZMTLQX1mcaWkSxNK O26pTlUmjBKYJdKwSJPM/RsRk7WVveZHZliLmiUmEVhPsLsKBYETngWmDNOjqeLAsUS8UnkqS40a AdpHZqrs4GNtxlscJiJG6jRQsZRkZGYibEqiBERfiywBy6QHiOL8pnowotIGI1yL45oNQcqm906q IJJK4qrg1WmsiK5GyC9vZqud+xcA5wC0xmxIP5PSerp0C2GSZBJOzMMzeRRlu/b84j19c0kV7vTL GuVmgyL/Ax8pwgMUJ4uG0VpOPHDb+SR/eJ4+AlS7Kz0MUrakcemo0yQ/C7qZkukwlJr+Yuv6y4GP UV1ijMOHHCleGjojhlz8TigYLuqlxATJ0VDHJhdd8QvgLULxeR4adg5gi8S67BLDCmfno5Y51mMz lSE4NnyEEWYi6nGgleK83q+NHwr4mpzgDtA3+ZKT5pinNSXP6HEitbezpx6UxhL9L9ve9a4zV7Jt LS5OOALGCZMFVXt3MrrbCF2dF8iM1ymFucnHuH3nb3jDnlorcxXAaRTQLV/TkSJltcescuQjy7AN aN7DYiofr5KtJxLEr51oaGxXCcfRWnZwRXTI6YShoRVxRgvDgQMmO2SVQWusTErSsEyRzsRIC0wX YGhGhySz7BhJguAx7p4OmVltMhvn2KWjFCqTYJFh+TimHbbFaspHoN+rnnipzU1BXSOKZVPgKpNH XJ4LHaLyqP8Av0ZjnyWaheJmBljy6mSN6zAO4n8zZ3SVEe9nn4EuiNyqXJ6iZtkonE2vGCZQ7wJw I6p9l6oSDph+oK0Ep9VlW6amCopXyz8oxAqE3F7lGCvysQ6UZTrYrNKGJzaxOQF5I51FuUiPexvC +OZ9WVZw6nRqtsHxRWEQJhQeFEgIrvk6wC7GIq5SrTI8ILm1M7aJ+CmWe8CZHiBSbk3cuuwWqKp/ wjbyLuSKcKEg1qXyDA==