# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: davi.arnaut@sun.com-20090811221149-ilgod8jsnowzctk4
# target_branch: file:///home/davi/bzr/work/45261-5.1/
# testament_sha1: f64d1f3b3d6d90672b6f58866830d80c483088ee
# timestamp: 2009-08-11 19:11:56 -0300
# base_revision_id: davi.arnaut@sun.com-20090811162945-\
#   slhlfghir2474411
# 
# Begin bundle
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
jobjvI/6iRD/+LuSKcKEgTAvrSg=



