# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20100928071226-kq4slvxe45kuo39u # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 2b6ca8757517af40a3c0dbe5914f692eb0ebcfea # timestamp: 2010-09-28 00:13:10 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: jonas@mysql.com-20100927085457-84azpoy02ufpo8iy # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWccQ834AAw/fgAAQWGv/93+G CFC////wUAXZeDiNsO5husAAYSlDTKmnplPJtJPFPFG0BGQNqYT0AJKmU2Uz1U8yTaiDQAaAAAGg EpqEm1T0nqeJG9RGjT0hoeoAGI9R6gcwAEwABMAAAAABJEmhpoTTJNpoBBqNGmhMgYh6m/Zm7hN8 XkiXEoyMoZnwshSzNORi8hKeEYTCxQ0D9ZUZDvMYkkm2eo174zJkIVKcuBzhynLT2Zxg5hSvd1Ll lIx5chYc+bwlo0dBhCQQnBtLarzTXOLJw3BDvcFsPJUZHyIBIJhzGSQx/RD3Ca/rhMUOJoZBUkdD r1J0M0doqz8idAcSCAxLh5RHeUUtzDMTJi0SIN7CoQk6SXvcFEVYmMYGRGWVE2L0lUCeAqa0IsqF FF5rY/EqiJqCuh0msH9O8qQl6xSKTsfWvMM+BQRIFBcVWSRaOlSrCoiTFerq8BOWsuM5cY6oMNUW GEW3qWyLNYrTDaztRIwrNCEovyC1PRODsImwDC24DklA2Y53pXP1lnDZ1CkLjSLLiqNzhREzjMZX MUrfv7jnrIE4zu1BvkZzuemOkhamLXfXaLAL3OBxFCgsaoKUZQC4VhDD2rKC3/ggaVa5XKDUVEcD TYKmsUDvXEyLaSkkKBeWGKaJOovKaw8BOSJD3g+yUltrqWFPieVE0cGKN2iIfGkyE3gowDYRLCeL GJxWknTL5z0DoCqe8Zn1XmGbEWJwUFfIkYs1o9NpNx1VgJySSwjKMMgHFErMaz49u6OG05uathIt wHNTdw2zY50F7JGUe5rZiRRRpNhrHIG2emJmjDWEIlWxuCRyS3jBbWkYhhWa9YxWYj1jFBeNSWiZ DDhS7wiQExQNAK0qahj6hgfAqKwoM52iDC3YLsPQDGTswfhQ1IhISV8zKFXl5yOxhPg6Ed0BbNpI SQeHUTa4S6+A+D9SgFxYEFD1GbP/XIBVYzNskFonUYEf0I0lFmPbuHJ/M1iLS1AWCZHsZID7fEWZ ptDdpuPoxSRPivX5+sSBZ5dabKKy4tpJHJxjf6ASsGXzmH0adpeNPX9/tUPL8T3mHNjsOgPJArR/ Q+++tjsbfecd9xUiIoOQFwcIjFczd4hzy2WGU0jCWYvApJGblEECzlNcH69DiNwPOVV4ouIXWxns ZqC0cMpHUZCpnlw52YtSrOK7okSMs4OIZCp7T0kTF7ikfUUDTBhqOJSwHhZqDaMhrePhJdFBqNJA mQiICGcaTKc2bz7dRvAVJAOjzD2Ngux8A5MrDkJiHa39ZQQZLyNG3AVkvzcLcaiScn701ZefATFI rgw2goAYskEjySuqgezdxrImIHQDUZLkXnYVJYwvM6CmK/qYmlwxvFmk5mHuDp+hcgNQGA4GSRK/ ogmgGDOg3mC1UHEmWh+woi+SSMUhiv8+TMwyYzBh35nejAkMVRHDI4JFhSRCWDb/+FLEYzkoEEA4 OgHHLRhWKCVhUMRIlBcYFZAkDgwnYTJc/AoEeIu/6EuCQrZAZi8yKuwQFqVyLXF6CnhQLMuxGGE4 UGQSFTcLGop4hwFpLaEQFmQBVGheFJyqQ5jC8gVpBGkiOKmRETzKizYwNWZgMSFUc2GY8w1CkKST Zj1W2Hib9fySImET1BxhrzDIXgTVZbaHImF4OkFZNKhJoOKsuWXi/MWfEvLBkBMmHYXAI3SSLUhx ZgYhTII8cCW08waQuqvFtFUuoyYkkWOK4Ti80jHwQEUw8X+LuSKcKEhjiHm/AA==