# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@oracle.com-20101130182552-hfydggaeeys3tjqx # target_branch: file:///Users/kevinlewis/Work/Mysql/55222.push/mysql-\ # 5.5-innodb/ # testament_sha1: 38c4829f66332bc6ee48b193ab6df701d96863c8 # timestamp: 2010-11-30 12:25:59 -0600 # base_revision_id: kevin.lewis@oracle.com-20101130161027-\ # temnixigox8l8p9m # # Begin bundle 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