# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110607194842-uo0hu844mmai7pib # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 58606db726c333fed87500d0fe4491ea685dc351 # timestamp: 2011-06-07 12:48:59 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-jtie/ # base_revision_id: magnus.blaudd@oracle.com-20110607124908-\ # 66iq8xk0ajgdhyaj # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX5tw/0AAu/fgABQcGP//1IS lBC////wUAVY5Vril7bcXYytO3uvCSSaQZU/CZpNT02qeiahtT9Qj0T1PUPUyCSQBJmIknqeTKHq AAAGQAkSCIZU/0IEjTT1Mj1NqBoBoAIqETT00Qhp6TQDRkAAAAIpQqe9Bqk/Q1TxMpjGlHtUepo0 aNAepAtnUcG0fSS5mRx0mg4bcpYobRxYr7iTXGY+FZGqVhBIWAqeIvbu6WaTa+vggrMuo4YO2MLz vamWdB1iKzddYchY9fz/pL4mf28YDRlOAurT5Z6EsWVjoito0G1c+oHhGVriuMoJpNDNuYObAxmU 9DdOIWZfCNo/Ljzim0MX1blduFMUY30rV1tDcjFR/lJHSyoNJFp3IL4nRdq7+2gp/chCWcxYAYFR BkwYT40lUmpvrNNCs1h7v0hOv5N6DCeqSbTpQ0H6yhRb8JCaQMKBz9JVCLpR5KV0M0PHap7p9N0V rqHq/5ofZzlTf0rKJnztfGgyAy3wuO0mg77UkF4ZdhE29dIiJScS0t5h4na6zRqui7K2R4UD2ebb JIebzQi9SU8PTokeyIYlU7diBfnOe4jLhFKj9PEum/Mi03si6uz9DRMGThrqDrhM0gXQZ3N2bQra azLN6k04EqIfqONr1hDsSU1jvlQJlaQZG609WssGAbYwCYtS2e+VTAZDjCCWREm+ayorcYmkjXgr FKtAWnLOhu1d+0HVW22SDPakWIG3FQNLFlc1cmWtn8JUIvssL6QNbFWM5qzQmQw3ZbKJVzrveWZy hGzlnyfALrozEExz0FjM3UoY0hLaFdGG6wr0GnW4tXEahmuEOVOslWgUs3Loy32DGJMQ8GK7SHaj ZjaElDN46JpouvJK+KpoZeOqmK68ZzF7lmeA5Gouy0BkeXvPdsfU5la5wRAQee8aY5F0h6Dx2Exq rYUvnIf5OFGPfpsuPTzEh6DvsoHivSZQWStssJT9eh5UgdSdJchdBORkuxckta5LOszE29OFywk0 LDGXQM73UQWkbXA0vsCJ9AU85nvzqpWriX/OW80aIIFLxStMDPiX2aYsLQlJLTxqMcp0DJTFJYmO xhfCEvkvMvqg3Dc07rF2HpIbLdaRvJB7Swp3b/C+lvFzM6mgVPyOws78vhpZ5oHcPg4fJDAdxeP4 uO7b/CQOC8jo33EyMBX42mOpLeXEg/3YcNEUyTgkLTd4QL+bMzM0rnM1u2zhhN1T0E+xRF2ymdkP Mso5oUlbN8XVMD4jD3ocnuGzkG9zobD2tgeE4CMDA6hBmGxk7GkNUIHEZ/vtM5IbEoqCVWw3lGjP JOVa6GCcsVwhtMfsmLcBctyIgQHC9dBUBDN4WikF+0zPEkdo8W5E4sGFyD8nxGeDDneQ86LPVwme kKkSKrWdhiQysNCsG2RUNEmoxGrcS6jgJVCZNA5Y5l+SGnehBuAZL0O6p6inQbUy00j5NG416yIR CkcegMv0qdyDJU4CLwS0WZMC47jFXHO9GNR9iIFUBI9aYV08VLkhlmwm5jGWEmm2OyBDqQmUaDFZ roGVtQ3bGDUR3yRAhQ4SMHmVl/MJnYEIFozWiEsKNSH0DTa/Z8xrJIGTANTdc0etCxkOCGCyedzZ HWhWExarhdbVxK0D1Bc91WSSqKD/i7kinChIPzbh/oA=