# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@oracle.com-20100721152029-\
#   or1sv96lavv0ks7g
# target_branch: file:///Users/kgeorge/mysql/work/fix-trunk-merge/
# testament_sha1: 7f29b76c993b7a813abef626510ef81262083227
# timestamp: 2010-07-21 18:21:33 +0300
# source_branch: file:///Users/kgeorge/mysql/work/fix-5.1-bugteam/
# base_revision_id: alexey.kopytov@sun.com-20100721101805-\
#   k230v6yi4ne4mvbr
# 
# Begin bundle
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
HxF3JFOFCQvfdSXw


