# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101130035750-s1l25bx48pnhcsi5 # target_branch: file:///home/cpowers/work/dev/mysql-5.1-bugteam/ # testament_sha1: 82400b7ff1a368501a449a35d76f245dcfa77842 # timestamp: 2010-11-29 22:27:44 -0600 # base_revision_id: georgi.kodinov@oracle.com-20101129153622-\ # r803cif0yke00bi6 # # Begin bundle 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 8gY=