# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091008124036-orpg35t9d9rj3218
# target_branch: file:///home/msvensson/mysql/bug46113/7.0/
# testament_sha1: f629e85f1c4a6609a4f124ef4076085a481e2aab
# timestamp: 2009-10-08 14:40:54 +0200
# source_branch: file:///home/msvensson/mysql/bug46113/6.3/
# base_revision_id: magnus.blaudd@sun.com-20091008111325-\
#   z6pwmh3n506ty7eo
# 
# Begin bundle
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



