# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110124125226-tecjgoda8urz5lkn
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/
# testament_sha1: bf559dadc2392aabc07b9c09050ec8722dd95986
# timestamp: 2011-01-24 15:01:39 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@oracle.com-20110124102828-\
#   1o7l37nibd18jwja
# 
# Begin bundle
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
+l+NgA==


