# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20100820145358-r81k0fcsira0jbtz # target_branch: file:///export/home/x/mysql-5.5-runtime-bug54332/ # testament_sha1: 3143f087cf4e84413ca804ca61db0b2709bacc17 # timestamp: 2010-08-20 16:54:01 +0200 # base_revision_id: jon.hauglid@oracle.com-20100820101659-\ # 7d3mk3y33mm7ogbk # # Begin bundle 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