# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: staale.smedseng@sun.com-20090723130741-omprvp0hi4ttyohx
# target_branch: file:///export/home/tmp/ss156133/z/45770-pe/
# testament_sha1: f0162fba078c5f8227ef12a6fa107f7e704f4873
# timestamp: 2009-07-23 15:08:23 +0200
# source_branch: file:///export/home/tmp/ss156133/z/45770-51/
# base_revision_id: epotemkin@mysql.com-20090723122141-\
#   0hixgq8rxqxfw2dm
# 
# Begin bundle
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
E0xoPAA=



