# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629125653-t799e5x30h31cvrd # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 27fc56548c736b7ffcdaa24ac0c80abf7840b144 # timestamp: 2010-06-29 15:57:04 +0300 # base_revision_id: marko.makela@oracle.com-20100629125518-\ # m3am4ia1ffjr0d0j # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVdBaxwAAZrflAAwWnf/938n 3iC////wBAAIAFADwy8ymZsxqLDQhCnmp6TSeqfgTKeqejapmQA0jMRP0TU2kOYExNBhMmTJkYTB NNMjEwBDAJKaTE0AKbEpkNiJpkDIAAGgA5gTE0GEyZMmRhME00yMTAEMAklBqaZM1NoQaJtKaHih mo9T0mgNAGnqDExlPFb7f1lg2/vUIbZ7aRbMuIirtQMsRGwTahyHt9hgt5wWpSk47v8ewTS6esdB yVv/WB5bpmfDlEsGOWEHkgo7AEMBmfeIwnLfhYZxYxdxvBCPcLxEM2aXvWTmrqzgnRpVX8uSHM7e I5NaIYVN/XO6bJBaOzZIxIAto/DA6GfKRl2OgIzjYzTZMsUTi+RSSFkr1ejWHnnvcC82GjPUGqls kWzkGIgIUyPUcaeBaAeeKpmT0ChJ+MpYqMqBpjULPGsZx1JFt2kotge7XFiqQUDRzxyIIGVwdwQ1 jxzSzSiieX+sXnFGOH9VxsJIt60lpTY577GK02akc1JKT4sxkQzG4XkrlL+Y2lSneLT1m6Kcn7ni bZiWM+oIDyq4hS8Ua76jPTV9rhFNItPARwtVJRn1EZtomgYnJ1dZZAsXoE96vmKYUzxZGGT2vIsk dJaX20XT6tRue0uMWSLTWsynQKsqvFVOrBF2ZF+FjozCt5Bk6l0CYSpc/gaaYT2HU84+blxOjQR7 /p6K73IwuMbHk2dBu2Pi57CLfvVWPMxgH3wIVbg5nDhgHl8MWOOVkZzR2cyAa/JQMlH6FmH67tI0 9YIa0d3aiINJHKA8uoEVOmVdeJVhvoRfOI4MuUDi8uLjt63QcxxJe0cs/E4rmTntLZ31DnFRLSaS bl0xatbEsTJERloSK8OZbvF3zVyoWm7iNl8u5RepJ2witvZ6jQuzxNxnOn58NJvZEKzPipqT458o LxK/nqrvNGgOMC6TMNDmhkFzy6ZMh85hT9ssyoDk+UG0iFI6SvQkgpopbzUC2dghAfJLYRjjFxup y5zdoMUw07zUvHdPiV8SpJvKyZ9jOBg8xc8TQDkHXRIVKGc4Kkp39E0ukptVchJacdoVY/7ohJkD aeQMPlJ6b1BaCwR43BnSNO36xBQFEQlfLOkMT14Sgbo8NtU4CHpk28Rqus+Q5uPJS0osNtWD4wIv gGyVRijaIKezukuKK0RsDK/BIjlH5DoGZCmDCUnv7UjnB68bLivkiY3LbxaM5UEp60XeXdZI2yLl 1rRQSXkXQKMkWc2BSc8EiarfhE3K6udNLlyYUFDNs5b7HPdbdqDTXT+alJErJiZu0tdPI8McMqik JrROKGWV+Mw7zZHjkIu9smSdSwBhSIo5ikXCoNtuayY7CZ32D/n/F3JFOFCQV0FrHA==