# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20101027065420-zru5pvc6u8sbmrjg
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 3c2435ba661e78f50a5bdfef52b96c19a62f1c2a
# timestamp: 2010-10-27 09:54:28 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: inaam.rana@oracle.com-20101027014558-\
#   ax7egimco5r8zp42
# 
# Begin bundle
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


