# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20101111095535-nmwbjfcenfjhdpg1
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# testament_sha1: 52aa642dd995e4b51c017726ada7d2b87f7a91af
# timestamp: 2010-11-11 12:43:52 +0200
# base_revision_id: jimmy.yang@oracle.com-20101111053212-\
#   lo5nmbn8hnrjkwm0
# 
# Begin bundle
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


