# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101202120947-\ # ub7q353mmhjm4np3 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1/ # testament_sha1: 6d02a2ecb5f0b8d6d59029b0d20128f800bb5400 # timestamp: 2010-12-02 13:09:53 +0100 # base_revision_id: georgi.kodinov@oracle.com-20101126102405-\ # l819wohslm0k87fn # # Begin bundle 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