# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@sun.com-20090921122453-zmkctioq5zxut4z3
# target_branch: file:///export/home/didrik/mysqldev-6.0-codebase/6.0-\
#   codebase-bf-bug46606/
# testament_sha1: f96a0a1b84ab285fc60e58ecd37ffea214895ce4
# timestamp: 2009-09-21 14:25:05 +0200
# base_revision_id: epotemkin@mysql.com-20090921090924-\
#   wjjp3enkiydfb202
# 
# Begin bundle
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



