# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101130175125-p4ifpth3lms2t9yb # target_branch: file:///home/cpowers/work/dev/base_mysql-5.1-bugteam/ # testament_sha1: 34846e9722ee092d9f80289274a0b2e486d404c3 # timestamp: 2010-11-30 11:52:21 -0600 # source_branch: file:///home/cpowers/work/dev/base_mysql-5.0-bugteam/ # base_revision_id: chris.powers@oracle.com-20101130154350-\ # akadrkqaa9hdtwjs # # Begin bundle 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