# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kevin.lewis@oracle.com-20110426175552-dgf4hxm5z0ectjjc
# target_branch: file:///Users/kevinlewis/Work/Mysql/Bug60309/mysql-\
#   5.5-innodb/
# testament_sha1: 3a3527ae1d1d9baa9159f821920fe970719f153d
# timestamp: 2011-04-26 12:56:02 -0500
# base_revision_id: vasil.dimov@oracle.com-20110421080909-\
#   3wo7n691v93t06kt
# 
# Begin bundle
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


