# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101006075629-qi2dj5yoq5sg336x # target_branch: file:///export/home/x/mysql-5.5-runtime-bug57002/ # testament_sha1: 340a18bcb5997d65a37c47dc1d4ee95a9e239b8c # timestamp: 2010-10-06 09:57:02 +0200 # source_branch: file:///export/home/x/mysql-5.5-bugfixing/ # base_revision_id: jon.hauglid@oracle.com-20101004141911-\ # mp6vfiu3rl9moqz6 # # Begin bundle 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 JFOFCQ56GlHg