# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101130031005-rqwbg5blzr7fo6xf # target_branch: file:///home/cpowers/work/dev/mysql-5.0-bugteam/ # testament_sha1: f7d1f8318a228e04b6eb906a8af744789a9bcfed # timestamp: 2010-11-29 21:10:34 -0600 # base_revision_id: georgi.kodinov@oracle.com-20101129153324-\ # c93bb7dfeglndun3 # # Begin bundle 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