# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110127112729-rd44cmqewxf2bzp7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: db72258d677c7ce25c8e58e2e1d8fa667ecd5596 # timestamp: 2011-01-27 13:48:24 +0200 # base_revision_id: marko.makela@oracle.com-20110125134308-\ # cle24ig6ukwe7zw2 # # Begin bundle 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