# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: charles.bell@sun.com-20091103170627-0kducorvuf9er5lc
# target_branch: file:///Users/cbell/source/bzr/mysql-6.0-bug-47804/
# testament_sha1: 899e5db53a6f269dd6b755f2eccb6bb6805747a2
# timestamp: 2009-11-03 12:06:32 -0500
# base_revision_id: ritheesh.vedire@sun.com-20091028073122-\
#   tg7o0bbcbhvvf6ns
# 
# Begin bundle
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
pPWwKxCRn/i7kinChIAHw4rQ



