# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110405105837-iws0lgom87igpx1t # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: a21204ab10e64505bdf86e430397cad207d1dcd6 # timestamp: 2011-04-05 13:58:43 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110405073758-\ # b8y733yvkqum940i # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe4IM3kAAjLflAAQUmf/91MC EAC/7//wBAAIAFAEOdedsCrbWRqqCSip+jVPJpPDVNPFPyoG2qNDQGgAwAAAAA0GgDQDQCSIKp7A TDSm0KbUGho2oMjTRhlIAjGkwhhMTQyYRoAaCSSaZGmiekwImmjTUnkh6mTJp6mmsx7F1+Hid86M uHZhS1UcdLV74xnJ6aRryMDcMzDMvv9ljGbGFz3snZyMYL/Z8/qdfTwN5keToJ3WZbDR/cYBqr4k qoJSCwGQl1CKGqgNx6g9yDkDISwCJ075wKX79JS2WQl4s65oVZmW2TNiKGZYMmZuDwfY/vi9Co8V ffFwL5goicBUQYHULjaL2BlrEqgOH+wnhqJNrQTusfOwFeB6eXMvqihdyWlsH0iw1ooOKDX48lLc Q30sOGrF/kKndqnQ4rGC1kIfgETdpF+ZFZ8kLi9ky0q1IQibUrqYmrYC3xRx6sM3uI5HPThZQtGk Dnm5fECgoA8wxmWC8iJ0y1DQFgUY8rQ1wHhx0mVSbBT4mwsiueZaYxKuet0TIFjd0y4OCcq3sUGC wS+LHlaMys3iLd16hlpTCle4omhUrhhoHFghIT85tRA9/CTxdgqDA1xVYSE4ldSswwCJS0DDhQRh sJ8SFYF5Ax9QLXlzp37yJSLqO9dgsrKxTcNzJwLeBWLAMuBpMrNGyLxz6V34gzYNbPJpWIpBTcG9 jSViI2NIT/dbe24ci49iqo6djbAXXkhQmMmZvq6sR23s15amkzXMh139JQCAUiLt0MxdC4mUJvS2 SF+5d8xLARxswvcjNC3bDY7OtLg9Cja1acwp2dsfkHgZw5CzY29fMBh5MXyJi5eJ4i8ZTFaK89Kz lz0ZhJ1gJVTh53kxfIzM+l112cCwJg0UVI/q02FgnyF1WNlnQ8c04Scw/4mcyo8MTudzzN/A0Y2w sRoIntlbZyuuZ2XXxutqZt+GnqJfZeskwM8q4aShzmRQypD0OqF0yUjQibyBEVCiWr6JniSYew2A tV6AWAdlw4NsK3QRNYuNTD1vQ2QV6qYF2Ynj+PwuqMJf5ri+5EqHVHg4tArNtMxNuhfGqLBKQctw kiTkBB5aJMG4EuH72QVnzQh4NyQsw/J1TD64q0heUqewlJQijiRgrWRFtYCdq+wVTA9y6cxKE8UL sAxBHdnr8CXRFRau6C6I1YbYzMaA9GGB1DdlyJb8QMw1yqoeTOkHf3EQSlSijfwLSIkyye+dIkIC YW/5AcKpg90p3VtyYct2Q5UHduk0xeBBlcw8bIjrzCDV2Yh6dxTCVON5zmjAKhPcFFnj9L15fkGs FS6d30wwYqWiOgUAoBUi7MYoDvqGUVD/zL8foXckU4UJDuCDN5A=