# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@oracle.com-20101230125951-\
#   hxjrjjsqqa2svt84
# target_branch: file:///data0/martin/bzrroot/bug58165/t-bf/
# testament_sha1: 3da740c07459732ee47a295061aeed479d5d791f
# timestamp: 2010-12-30 14:00:26 +0100
# source_branch: file:///data0/martin/bzrroot/bug58165/5.5bt/
# base_revision_id: dao-gang.qu@sun.com-20101229053531-\
#   6jamezb1vubx5t3r
# 
# Begin bundle
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
xZ1oOgR7H/xdyRThQkD9rVKM


