# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: holyfoot@mysql.com-20091205085834-rse475cohin0a1tq
# target_branch: file:///home/hf/work/mysql_common/gis-bugfix/
# testament_sha1: 4c80d587ae264b91c6d6800bec975572954fce3f
# timestamp: 2009-12-05 13:00:36 +0400
# base_revision_id: holyfoot@mysql.com-20091124163534-hywby4go5483txcn
# 
# Begin bundle
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
SFA20SJwiF/+LuSKcKEgX1tT4g==


