# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: olav.sandstaa@oracle.com-20110414122514-\ # j8i2y8ra7n4cvwqw # target_branch: file:///export/home/tmp/mysql2/compile-error/ # testament_sha1: 6f22ca0effa71c4f3d1960eb866539f85abc5cb3 # timestamp: 2011-04-14 14:25:18 +0200 # base_revision_id: olav.sandstaa@oracle.com-20110414120453-\ # 7gkjhhpuc9il3g9y # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdpr30EAAc1fgEAQWHf/93/n 3pC////wUATLatoTa1QohICSSEw1PUyFP1PI0Yoym1Maak2hPFM0Eek/VGGUCYmjIaFT/VTxJ6Ce RGT1AYR6IA2iCSIFMASYjFNppMagGgaAANBoOYExNBhMmTJkYTBNNMjEwBDAcwJiaDCZMmTIwmCa aZGJgCGD5WTYWXQG+3+lmu6FFgSOdEOZBJS+2WS5zslQ4PKiBp7NKEIP43gf1bffO65ikKQxae6n 85W/HphTJG9m7x61O8si/MPP52j9BOcKP3a/1GOg/b0ayjPu6b4EjmuK33sSjqKonbLIRx5I5pmI bt/rv6eHtm+KizuQ/oFF3nYw40jzKqRGzOulNO98hUyV2WyUc1EjU9Ec4jCEJaL5JeGtO66hJqmE ZVEnHDIhyr92SL1acJ2WyRcZBExlNNtkoh2/JlUJED4Qd6RlHZ9AV5F5AvMh4xWRdVzRagKydjg8 n0diE6DPvqIUc2LaKFWzjdTk9MdMYBYcNJhiKpxbFtleoI5HOVS116UCNkXW0O3M5i1sVPJeUGeK SBMgIMxIUWcJwbTZUZ2jBQquaLkjFY0ZjET5QW62D1cMHEBiTLysI0ljDYFTNgltMGwQKa5V2HMC lg0zRZBjNetd2CRBQrDX6gjiLmuikvC8RXoOkGTPRhIRNod7HWonG57+K0lGzuFwFGBdc2aD348l ccGu3tyc3GG9eTHGSyDVjBr6wfJsOSjVZokBO6g+at4DonRuw2eCufq1xMYeXTtSPT8VzQZMQ8G/ TGSKLx+/jNz/M073+fP9Qb/OfP8p4cCJjwQ/JYqxyCr76wl7nxgwBSCqKY3yluXOoS+ZCy9seXHk gjDiy+Qjk5ecx1cIl4N38iAuQ+YROkf74zSPag03+fEkHl6rY6rZ7q9sxHEKWPHiig/0fhgSNlUz XZvnQkZWw8PiVnzHXavsqSGg1MWo1LZth/Kzf0ptOUHqsJMNthuHSPmkSJL3QopILxPQ97v05c87 TIqteRRRrufmWDsSLNYpZkh1PpgUNDW7Fg2dakEuHuxGli9PoW7iXHtzcNEg0CAiroPzfnlwxdL1 +xrb3Pu19s/Bt3q7xh7LBp3DDYJyDAga9Zrt++/c9UBKnbqsWOk/9A3EszJ6y/93drdj6NqFJGEl rOUa46O9aOkUgtKpqrJekOFbawYV0A9bLCb/hb1xBDaMaxccA1MMzPhJNpu2MmjvWgO5V7WCxZCs XAM7x7IHx9c9W08sdT9GZLQwyY3hFELo/A5+cVK2mMukJ+9dR7zYGpQCES53IIH1nESVzqRIZdkt WCvdbRdppvXtTsNmcmEYJrblEuIFpDIodxIL1r32YWVEKrWdMzMwwvAJivZdmvTFAZIm4A4uVnJ1 SFQiNsZDsmVyyztCGLIOuq1NfotMl2nsGfor7yFcheZhw5S01hMf/JGcMIqm6IgYWGPFqdZsWYIk ud7UecHqtFdFPPOHat/LMUbBZHl7nAzdwnJKyuSKnPLGiwVO/ORkkgTKr302SOffe0HT0D3JAz2a jSQ5CJaqFjhPatwXCjYcGpi1VheE0h7FhJDSDAGHbsIJJ3rhMvJulp9UMGWiwfSZ97kJQHqLAvoJ pIZgabKE56Myy90TXwGVueqLJG5NatIYC76K2z6a+sWczLcaBLcJgu9CaZP/i7kinChIbTXvoIA=