# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110617105125-61py38bpfl730b8f # target_branch: file:///export/home/x/mysql-trunk-bug12661349/ # testament_sha1: 95751be3e1ee98c9b9284c75b886df08b83cf61e # timestamp: 2011-06-17 12:51:37 +0200 # source_branch: file:///export/home/x/mysql-5.5/ # base_revision_id: jon.hauglid@oracle.com-20110617075559-\ # c5bt1ybrftcdtmys # # Begin bundle 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 pHYr/+LuSKcKEgV+T0hA