# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110117120648-telkjs01t75kj9mn # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 551a34753d95058157948e17f741142e83c431bd # timestamp: 2011-01-17 14:06:57 +0200 # base_revision_id: jimmy.yang@oracle.com-20110114170228-\ # 788l136hkgpyskpu # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUNGrf0AA5HflEAwUnf/91MD EAC//9/wBAAIAFAF/uSkgAS0Kpt7uaNhJSKep6aaYU81GU8o9I9Gg0TTCGRiGAAAAAAAAAAASKBT ARqntEn6JlNqaeoYmTRoA9QNqlPU0yNNGJkAAGgNAAACqKAEMTTU9NTU0zUnqek1H5Uaeo0Damki hi46Obtmk+/3fB43o7dvGrXtjkKsqIhcvabJ1WPQ6QjD7mQdwbwbbbbaNXklOVK4O+CL4uCwdsKT lN0cXf01+Nvh9fwvnOYw9P7EluIbQ9PzBAXcJ9nNtrgKzpuVbftd7hXKFpoRJ+faXRyF48x/qIj/ Itj5jMUikcnXPTesisZ04VzxAM92gbGNj60KxdxaGwHGoKEgWUkzDKCd/fKYiKoiPoJtI2jXBVSP cW1tugpI83hlF8kxjWpoKHJUmhXTU9PjiLvwjxFrK2iSax99cgLUlZl7O07NZzvSVw1ewU6QA1nU C2FDkAy+ksO2m26JaqzA0TAjULzUljCbf8u+VnDm8M33RtHYWkZN/XNtFWljkoKENLFjq3luRTxi IwuItSs8s7o8XVZdMFqyhd0pyYRvyFu2lERc+JmYmZn9SG/oL2mji4pMFeSpjc5qbDYTGk1rYSi5 Q4OCsUbilUwtcfK0XVzDSbcKIrExSJjdqM2A5scZqItc5/cm+G4uW2aOahOM9d5trYsWubyhxcIk XVLOdY2YJdNONRDWim3lTxomrO+zLFWxV75sVeLIjTTPm1XdeGVw15q9WWiNRW5iaGsUTeKoiF0X u1YzVLWfNS5qh6EUq2Tn1jLppojR1ZKFngnjq0myMBWRZwGxtcz2dNMnluvNM+lNKzbTBxiea9qO UErBT1ooak59BkrtGDLhev021/6RtwujvTHeZooXXyraVcuk1VxywkikBOp0RalVIqK4wqbGMY14 o3U39UMwIKDHzCMTLkHfgC7lxQqXDY02P7QmCM8HMxitKXKYj9Peoe11G541o4SdBil3eb0hFTId sVT5lkAHDyYPlkzyVKE25gY/BXqd0liSOcCiOOlHtqNh16PpvIveDu2dWGD6vUeq/5a+kekIvFyq 5kvYZONjliMRQYDN9RS5jlZELH490aPh3d52ofPOqQpI/HuFl0sFsRZzUPH1pc91DrZStRaid1UG Lwcez9bxuK4qyBUVmfD6gaDB+hsI7kSy7nbgc0yAnQR5kxsnqR7bt9K/lXulx/mfYw5R+UqMjGIz pbd+/Ti8lA/SW2Ya1mjCK0j0sf+3DchZATOpTcixMFMNK8BHlqlHZ9ODCI/JdBTvwHcUfJQfR3Nu qhX2PmqVqYL1kJ/OGUP3PsZnzl9H2p80TGQnzj6+o4jAZwEPOyB0HtWCUy7f1jvySxMe9A6pI2gn DivG8E1KLFB1onealDmITOla8F8QKBMBUNSGMV4R5iLITpFNItoHx24TjGg5QElDiSgCRbURr8W2 QiruHeEfs/rCTw7ZxxOtWKisguYK0pRFETaKGYQCCWIUUwWppSnAkHCYlHOhMsQSYpwXZvEtGHlk IOmgDjEmfQEsYRPk7SF+MfTsjEmIaLrSYh6JyNRnAkaJ4AuTikU4XIpymJUWmN3gKk5iQ1fqJIPg CnyjPYLA3MLgrSYa1WfFhWbyypLoNETF7j1FI2yF5gqQkHoBHFOGoFfLYBzdNmWkt0JWgyJEe57L K0bYbo2rciNY81KIs4+WFuWhKmN4iwdTyGgmLCMmJQgJYhTJ78q/f+LuSKcKEgho1b+g