# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100504105349-l7chv241chb9k7ec # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: e46650c3dfa88420f8342a75a96a3a7d91573642 # timestamp: 2010-05-04 13:53:58 +0300 # base_revision_id: marko.makela@oracle.com-20100504105324-\ # u57dvt01iqbzwail # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe70hGEAAZbfgEAQW2P//38n 1yC/7//wUAOW3t1m25OQHXCShTEmmyg9Ew1MnpHqMIYQA003pJ5QJRTSnoyY0ySfpBGhk9QAA9Ro 9IAAlI0JPSYJk1PSaNAabUBoADIABzAJgJkYARiYmEwmCGmJpgJJE0BDTBNBT8pkyRhNPJGJoNAy E+OvMX3dxXGiipKsHTMjIlQhCKxk+eZxPKqqX6z4jkZSyLFVuJ8nj+6pjzYL8NNTBJvXFRZkH51x 1sdeiNWlRCc3lJH5v6zJKSYP6EQ85yGIuS2EqWuVqWDf0pGNIvzmOEOKJpyNMy+D3NS3RSCjiekU ElygrCUcgi4BRCKBErgsBRvyZ+gsjShS63S9rEQlQM+iee+A0ikiZhh+OPA2x1B3lVPNiiWwZMRj xFLWpU/GCRUw6R6VidlsS6YtiqLcih1hYZDhHQIRnqRUaNEsIGkjJyRmkMYsqacZA4BnDhiggLIF pj6arB3KfSXZQTWnf1zwQVD1JR6qBvkJlQXlVxbFoj3EBzMpkeVV7+ZGjjAH7UNpK84+6xO2xCA1 MokE2hJS2maqA1uYoqMLlLjicSD5SNomCp5jKBxlyteYB5YJ9A8vnjTF6hkJgjMWbV3mRhYsU8LJ B+duhzotDAnoNGt0LSFzXXSZIrdIxMG7WfZZ3QdAPfxLLFVW+KvsimpkqrtVSX0zGwG4Ns0BnHB1 GYvmtI3UUJEfaRjw5LzSPtUZ4KkOigX4lEvZyCs7RiUXZw8YHE4lx3ZpJDyUDsBgylvEpKNRid5U eUuvx3CeeAtkGSFuRCPoa58pOSIxFaSieNBaOKZx5kMDktETCLuNOHTVbpPkg4tYmIUNVY0TRqo0 GsEoZeioK+ql8AzGszzqE4EifZOYais3RGBGWDi8zH45tpbscuG7asCCYG/Ww5+Y1h4JyU7AZTXs J6voKIvK6bRhiIs2hRb66HwrAnMFcBjFvtKN4vSpIsDQCuxwoUwnpEU6QyJenDLuj5kjpSKcetjz HJqlkLX66R85CU32xwA1nVIvrAIM8NDt/PpQ9kMnbgXbFCv+q9ClA3RI/iR0BQu1ypkNt9pq1aln gShPtkkG+XHIqtNynSWxe3hAVHurysnzRxgpla/OECJhkyiGa027XMJCoBkE3no9CXYW9LtOiBD+ KGYayFWYUgEgj2WdxUuzCObkKVbX9VgEqr7sVEr81bM11rbdFo5/5Jrk6/xdyRThQkO70hGE