# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@oracle.com-20100709125513-\
#   z0rx8z077p1jn7t5
# target_branch: file:///Users/kgeorge/mysql/work/fix-trunk-merge/
# testament_sha1: 672568d2142bb4dd3f215ffdb1cdce4e499c5b59
# timestamp: 2010-07-09 15:56:10 +0300
# source_branch: file:///Users/kgeorge/mysql/work/fix-5.1-bugteam/
# base_revision_id: davi.arnaut@sun.com-20100709122851-\
#   e85rfo2p6w69t1rf
# 
# Begin bundle
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


