# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622115215-kxtzx7xuugcxd375 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 278d0982bbb75474186b4e4b4037535de7a713ab # timestamp: 2010-06-22 14:52:30 +0300 # base_revision_id: marko.makela@oracle.com-20100621095148-\ # 8g73k8k68dpj080u # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYJ5yNYAAcNflAAwemf//3/v FyC////6BAAIAFAEfu73dxVW3j0C9bO8ElBACaNNAaU/Kj08pqepk00ZGR6nkgANAkoJoYQDVEep oAeo0AAekABoAGRAamU9JkNUeUaZHppH6kMgAGgAADakUYUenpNJoHpNqPKaaAaAAADIAEkpkETT Yp6g2KG1AyAAANDQeoGgyYYZj8pbQocS0auYbL1YDBWxVp1zCHx33OvRyvgtbuEcm4kRD8uoTfGr QeiB6UV7v79+rl5my/ltP4ZnhF+kZcPjBrP4RfFq2+nzcSxpyHKclNxPi6s4g1m9iwgUXyM5HuuH WXU5r9BzvfWZkL2OQlJtXMzyp2y/SRl2IPpaWYvAVWCJItK+6LM9YmCVmES4RGFOumIhUwjGRkXy slMQkAELqyc2ATzGEy7QGcoROjmuBGed55do0veE10FBmJXWrlzGa/N8hVFzLx6a8thKrU3i22sd n0BFJuTRZCm4T3s2NjaRdg/a1ZPDj4M4IyH4twMISMC2naN9VmJ6naQHMTJHYzUH1iaTB77h0cr8 tWrja+ZkgwGRcJAPB7FHIMEhiYg2jid1JavU82ecSoyCJ1iSYzbdi2BdN9zkFTCKvn1FAwwT81Sy 3HM0XhOtxcRGJXSISrU0wGYLOsbFK9YuCnQNdllsZ0a2UbdBDIrRZaphEmpKtGkysDXc43363PIN NGVZpVNs67AGgJKUiyyFAGuS48+jPyDcOl24Y2TN0e3v7PgRTqykRaZQvTMMzZCjyq+iZxkcSehG ew8+LSQnRwPx9j2YWlhzju8OLzN8tCQUZAeOG63zHlZlCXOSE5lnP0dPVzadvgcbUPiYHCKLtj5O ggOUJV2PuG+iQLWr14hD0eL6aTlwSHdXtb2d3dHEHWI46a30rQ3VSj9yCJw0/OR7mG+1VqrNJXp1 nvuU+T4KZzl5JDtfi5dSGomI8JOYPAkLh+Wqp53OBZYwWfxxUIZRYmdRZQ9Y0Y7ndPSpEzlAsuoO CxEKLFeNVywkj3w1l8Ls2eAS17x0w6PZipqJSjDVWb204kRZKLGjWeZ9EBhdhlZtzYNslz5L2R3t IPARayo8UxZ1ss1WSbo7nTQGyYJUbpVRDEQKzIY7tDrGJ9xGYf3DMWRNOcua9tyb6XCbjzsDQ/je awom7TGxay7Hw75J5Q2VyGQq6LkzVBlLRymHn3rj8oNKnX44HCn48LY4pJisG9LJecOt+iiqPXuV FppTNq3LaI/ONHXUCgh2uKCUHC/WBZNxlAE5Vl2FNdtZ0swLiQNZ+Y7wRePUa630Fd1HRgN8JQiS nDkZnkBDBQo67zgtBfBrwmYYjbDisZCaIKLKREJEZH2z4BSJOlDa5Sz9EaM0+hjE07yG5S1+Pnjv i1aBNSXNsaMlIoSE33iYjAkSOp08JcllgwE5gIejccUfiMJWLk6bsIpxo6twC3GmytEEwFsqngNt zl1c4fetWE0ya9qBmuxcEwsXZg5U3SbgLPVR9dRNfuOmpp+JKIqBUGnuMuBpYS7sCgVgmDaF1iuR Gi0O9WPpgziGAUxjP41u//F3JFOFCQgnnI1g