# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511161828-9reevde6i3sjlwuc # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: b4b7c2c9059557e85ae91cc4cd109ff66cf6a777 # timestamp: 2010-05-11 19:18:38 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100511154617-\ # 4ipeglopbpdiwzy0 # # Begin bundle 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 nChIYuO/lwA=