# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110222091702-sz9by4hnow3oiegd # target_branch: file:///Users/sunny/innodb/bzr/5.5/ # testament_sha1: 72f0f5cad007771f618c208ca3ff415b7e64e828 # timestamp: 2011-02-22 20:26:49 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20110222050408-\ # 73uxqkbkpm17emfu # # Begin bundle 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 VBMFlqBGVkGptPUpQMf+LuSKcKEh2VPGOg==