# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20110204153051-qnd9c3mdfv2q62a4 # target_branch: file:///home/malff/BZR_TREE/mysql-trunk/ # testament_sha1: b3f568878d806ad79dc5e0845560fb459a623f18 # timestamp: 2011-02-04 08:31:09 -0700 # source_branch: file:///home/malff/BZR_TREE/mysql-5.5/ # base_revision_id: luis.soares@oracle.com-20110204150014-\ # a8qb9s0cd9xtpiud # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeZ8/s0AAw3fgAAQWGf/93sC 2QC////wUAYY8AACt2d2AZ61DhKVP1NQG0gGI9JoNAAAAAEpQjTQYmgAyBoaNNqMIyBoEoIU8iZR 6npM1T01N6p+qaaaehH6UegajQGUmhNNMgG1GmgAeoYENAHqBJITQAAhoAKegU9NIGNRtT1I7Cil nH+mZ0F15qvdDp2LZost8FQioD2u7TYqeDldfLR3QvH8RJedyE4QSKc+G7o3RaTOzamMyhq21Wy5 cMFbyYubaRZT9T48mnjgRixWoeklVgrqktq4kD2NhebnbDyE97hHLHstODcp8pKg9wFUVLM8HKe0 RobjlmbR5aLMpO3MNgTYqWorMhBt3iFcSimFqH2SOc6GWNVMwD3nQRlCRfRK9kCirlQE70kdZ1ME okSooFJ7iKMQoD3o3zMVSCZGKpHDNaitgHKxKnoPPRhIobQMMR+hUgUfZ5AgRO8xGckia52Pe6RO FKWBYYLoVEj0gkynCcLNLDZDfLQYg6KLVfg4LjDTOaAXKfDBtfMNg5wCwEidpgzUoV1kRwScZigR bCkrGynIiglYKO7VtstzBpv0K1baCkRUJpa8MtivKyPIumeRd/wRujIFylLEVagnGFqM7iseXKtO qygEBMJDCkjnVuJCRl1qCGFchmMMK4GtcfCoI8bW0JweIytHiNR8MnC2gVXg037MInUWc5g4nO+5 tnhoYk4UBrpCWN4sBEHm2WV65KukjiZIohBpdLn/J8iKEWEB24MAsVf0MyrZNbngUTpVxCqLWiMv MIzWplhYGJB8J9oVj7C4H45zPlvT14edIiW2+uChRTHZSSHS+aczkvC/XhYKkMITh2oUVReXCneS wGLy0zGgBILYPBozDhMOGkCRKMox6BrNRgTnexmQ83H8nXmdzgLeIKlMq2YYGPzpCH6ejkeSt277 i8ogVtpsVgxcCEQv2CLtwxyNaOfTTc3okL5lq55YEUoL0EHydxe2rWVkxRPh8HIQXiO4mx5KTVNb nZWrJYYyI2owJ4T5XghCYwBGpijvi6JhGvK4gOqDaI4HMFBjFNyXg3hDcC1bUkpLkHGc29k8ZIXl UIWwtJpJBGSewzYjOSxDX4nK2W5WEyHyiyeVO5PFMpRZY522zhlT0F2D6Bu0j0fFTNhgRLZaOyWs FvhGCpS6bBdkWnYQFO4WqQIlEK0SMhftNdQjG5If0T4SScph11RXoBmOMbTUp1fkeGzwC8TC4asi z014DQlFeNwGeOKSSAG4kS3hE4GIY46+HEiIKHcHg8EWhx/04HcjZqeHgamHP0E3f8BrqQR9m7Ba dTQMANpkXstwFwQV/2DxDiLgcz6G1DHYadarW0PM1iYirxiUuCU270oI0W+QDwSrtsjH15Gsieoa IKrBeIHsU7ypSjrHCMsOZUPR0WBsS2hqoOAbgPxWBAeBAOtLDCEwNyMPgsEKSxz22Gs78ApKzoI3 i+oCwY+5+BoIYcM7makaCtIGAfv34j6SJIPyfMwdVmdJMmqmkUCQ9CKMAyol4m9GkbmZaFJjwWIM ojKJNhDLrE3hPEESKHeKGQS0hs3GY31sBBQS0RlC0g3lgVFDYMgvgqCrcYQKJEPwkKjw7yxK4gLM lWLHgJRO3NQkHiCnML6k/FjkHy5AGQ+AIMrrj1HhIY832AX0pUY6KyhGAzCMmeZDIT7JwcSXXrHN t7WMGwYjUAxERMFTDeYvU6jHmaxVo1jFiUomf5auOZee0B5PIEgMQtG5EZwcYjlA2eJWG3yKkqBV Le7QqtvpkFAh0VwjqtCRffrILieJ4DqjZXgBD0EMKCv4jB9gmmFgI0DMRuVY9UCIhoP7BqnSyJtG kKihWBxUgEUcIX3hwUx8SUQ/i7kinChIcz5/ZoA=