# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101216095523-uguxqyzv0aai9wkb # target_branch: file:///export/home/x/mysql-5.5-bugteam-bug58730/ # testament_sha1: 3cd9f4e1656551c83f502398a13a5a21d2e7085f # timestamp: 2010-12-16 10:55:27 +0100 # source_branch: file:///export/home/x/mysql-5.1-bugteam/ # base_revision_id: jonathan.perkin@oracle.com-20101216092755-\ # 2684lmfxl093zbgc # # Begin bundle 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 SYFpfYXf7FoBbuXjmGZT/i7kinChIU/Gan4=