# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: roy.lyseng@oracle.com-20101118094704-8z1qtmnlqly50xsi
# target_branch: file:///home/rl136806/mysql/repo/mysql-work5/
# testament_sha1: ba0c8518c51707289acc0146769f3454dbfadc15
# timestamp: 2010-11-18 10:47:46 +0100
# base_revision_id: tor.didriksen@oracle.com-20101116165843-\
#   86cs5woahaule77b
# 
# Begin bundle
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


