# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110126080252-vlp173hj98x1orek # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 4c273584a39923d65752b96e8e87296e3bc4e070 # timestamp: 2011-01-26 10:04:29 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20110125223359-\ # bc6tfhyoox0rm931 # # Begin bundle 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 FCQ7oDxygA==