# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101022082806-4r74blazeneeac9w # target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/ # testament_sha1: 9c0e5aa402abc370afba42013c83eb4076884630 # timestamp: 2010-10-22 01:28:18 -0700 # base_revision_id: martin.zaun@oracle.com-20101020021243-\ # yhxyhc6yf9fuug2m # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW0U+uEAArhfgHFwXvf/93/3 33S//9/7YAc/XpzmdtwJtb208vM2Staatu8JJTRomQ1MZE9U2ptGIR6GU9TQ2po8jUAaMGkNBJQC MgNImCYKQ09I0ANMjagAAA9QDVNpQBoANAAAAGIDagAAAAGIhEYap6p6n6TRPap6jYkDEeoAGgaA aANGHGTJo0Bo0xGRoYhgTRpiDEaDCAAwSJBBTxTBNqZACmmBHqDRoPUPUMgNDQ0FgFnbb0El3jH5 q1842FlUlYsXC+kPW5gpsiHcOdtubyq7W443dXZ9IVDNlIthw2psnL6HUivN5nXbNH4+vfDHIHMr EYITCq2MQIxZ0GGzuvFWACeWbgAfp0OXa5f3FxmOSZJnJoKkG4ksTMQ0WaaMOuKrLWwyyd5O0Hse pLflNQW+0q7irFSNj+ET7grDc7UsoG87bly8pI5C67RdiTQb0BawcH6Q3zuvpfN+zk6g+cCd3jhj R5KHiexYGQ7+YTsnF1o8hOrmbnQdz/t04cdLX5O4zjCnWMCpE1EsaSvoy5mhZQ63kEjCeGvdTd5C 2mOF8q2TltZTpuk3/bUMnktSDxdel9fmyqvy6SbkMG/ECPHIf54SRHxmvuETPRljgpyWoUbI0dTO vEGJB0ag06tT+BEYiC6yNfGeOa4t4YXr0C6LxKV0MZb5WOQscWGOQZcmC4cBmeitSuJ5gGMeQuEf Ppyz6+QEb6ph270gpX0KHMiQ9YsWCPEMstuVDZaZ+yPfUm2CYLWNbE0j1T54GLOqrQCN0eo1dfBp xG6V0MWJ80iFnZIevaTcDQbSe+GzRjn6l+HbS3vy6ayzuzwsC7WC4aAPEoFqhXXnwOCtGilmOWU3 hCNOPmXJ0gxbq77KZENd/PAbvtq5bGUIVUNC2J2BE4PXO0TabRY4FNMcd6rdCI033TFO1EtKuLPJ q/wiPGSwwWCIK0yptOeOq02izucqHjldRqaJgGtUq5+62U2wIYMzNY1ug4nIxiPLTdZoYw2qopT0 Xh0dTWi/Ot2myDx9WRRsaaQcmWMgSCVjO42+RI4YEs++xiULmbFk5eeVJRCNi8Bdy6Qct61XTM2d LsTB3KSjBl/QnRN2HivS6UWsJVjFQzlPXUwaw2KA/inXtDIm7pwQNhhloPSlb2lUiRT25BwFEqoo xgeCoohZIQwKKImBFQ14XhHp0PNsW5RP+uTkdF2oWdDokHzVJiLwtgNjbTGdIOVPBvDefjcpAug6 QMBtUHvw2k9eHWKNWYpXSsjTgVwKE8MZjp2CAPqOIxAIVMLpD8hq0F8Yg5CSGAQOQSBCCZwZ2yDu UjwfIMf7X+oOr14crXXUgwx49eSU6HfqRQXDoYh4+XRCZIoI73lUIq3dsV2XVrt9MxffC1tmGHCc T80q22LzskPeZSstOnvwPtma12ECx9l5jPUM7KOnQ5le5cLKXJJqkVYQI9PLa4jZz2h4RGdD6iL6 BmohGpgwd0z3IrNqbewF0jOqkvhQGEjOb8S5HHUF2YCmGfFS5RQrdgkaBvhhHQLxIwSQxDO2M3jX yZw/P5Oqx4NRSK89FmMFbu7YlTV4ZzOQu6CVoQLQGHu0QY9ngkoI+5861ZlTle4V3r5s7rNV2xDL PvnYyzwaRWZTJ7mYl0VyS2i2HGJwBi88hDgVWDZXOVdGUBuMDtAK8p7qnbbUSpgymBWYNoU8NVhw v7I0yHWuHPIDXrZG1MjVtsTq2BWnCnsUB0WLzIpGQG3gjuARndaszewbZuBldKmLRNE7fcJFJwAW GZarFskdnGuImD+rcq+VZN6WWLJM4kH7EUO0FFLUxIzJOwF0BsSHWcMmWuPp57rIbgwuKhmO0S65 gD5XvhtOXaW8pAc0Ih7g4i9SGjkDBRAPjXOLfekXiGWTImTSgLFaHNsXYV32TK8wxbnDLyavK1YQ MZTCxxuINkIu8tN3BPHjG9uxV1Z3cxjKVtZezkcTK0LCFTW4KzgmokQiYiM3MmIiyswqBRd3TIAM KLouYFA0IMTkzMI4tUiYIsqHPcr4klBt0mOs4HAzfxiKO/hYdUqotNLMUeURgHKU3QT2rsM25laD M2SJOgXa2MTyKVod/UfbgbLRbVf1XhwCYxj3OBriaPGJrUTEt+8ib2GBGkvRh00NJMVpZ18AvQXt jGmmVorMWrGFoUJEd7GfDXpGWFNIpqQcvusJx6TnRzp91qJGRoKLjaYmuNA+rGfJiNSzdHBx7WYh Fxm54lnAnYai4IT6J22tsEL3i/1DXUgo1mEITQtsJYmFq0gWnFMWPSJ33k2Iat+Y1+ExWPWDuEX6 GVgbckxHiVS4BiHc+GApYyqv4aK2QZAXNBkHlDEZYaGlzb+pKgzlZcKt2EzKGAzBfWi+rKq26eIR TAJizVk68/MfxdyRThQkG0U+uEA=