# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: epotemkin@mysql.com-20091201194139-lidh5pyyrbenqjb2
# target_branch: file:///work/bzrroot/33546-bug-next-mr-bugfixing/
# testament_sha1: 00e7a603eb78c086eca88d280596e8d0944a9476
# timestamp: 2009-12-01 22:42:05 +0300
# source_branch: file:///work/bzrroot/34384-bug-5.1-bugteam/
# base_revision_id: mattias.jonsson@sun.com-20091201123612-\
#   eyfrwja34w9mcgtz
# 
# Begin bundle
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


