# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110126120851-gr43jif33fooytlq # target_branch: file:///export/home/x/mysql-5.5-bug42230/ # testament_sha1: 46bda9127067cd19750b03583269d7221b5e09e3 # timestamp: 2011-01-26 13:08:56 +0100 # base_revision_id: anders.song@greatopensource.com-20110126073518-\ # rhsv61qa4oarwxoo # # Begin bundle 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