# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110228140227-9tt2bto9c93ticud
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/
# testament_sha1: 3091c1c72fd21a1ff3b609d0796f950df85a6b47
# timestamp: 2011-02-28 16:03:36 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@oracle.com-20110228093501-\
#   4yovj7fu4l7d2ejq
# 
# Begin bundle
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
e5H/C0r3L/xdyRThQkC6Qg3E


