# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101217111250-iy532et3kv3gtru2 # target_branch: file:///export/home/x/mysql-5.5-bugteam-bug42230/ # testament_sha1: 4aefcc41dd7030760727c2cae07b66d09608b9de # timestamp: 2010-12-17 12:12:54 +0100 # source_branch: file:///export/home/x/mysql-5.1-bugteam/ # base_revision_id: jorgen.loland@oracle.com-20101217090224-\ # bw6y486ip401upg3 # # Begin bundle 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 gA==