# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@sun.com-20090921125638-vwidsxe77gf16qkl
# target_branch: file:///export/home/didrik/mysqldev-6.0-codebase/6.0-\
#   codebase-bf-bug46860/
# testament_sha1: f945166889c128c9b46f4e60c427ee9ad372f9db
# timestamp: 2009-09-21 15:00:45 +0200
# base_revision_id: tor.didriksen@sun.com-20090921122453-\
#   zmkctioq5zxut4z3
# 
# Begin bundle
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
LuSKcKEgYlhGeA==



