# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: leon@darkk.net.ru-20101130113502-ybvk3qzzeu8fcq6e
# target_branch: file:///home/darkk/squid/repo/trunk/
# testament_sha1: 53cb1499bd92001589d0c625ef3fb09f40582cd6
# timestamp: 2010-11-30 13:35:10 +0200
# base_revision_id: rousskov@measurement-factory.com-20101129231227-\
#   txj9trtjvvo1jcws
# 
# Begin patch
=== modified file 'bootstrap.sh'
--- bootstrap.sh	2010-08-30 03:41:04 +0000
+++ bootstrap.sh	2010-11-30 11:35:02 +0000
@@ -23,7 +23,7 @@
   shift
   versions="$*"
   for version in $versions; do
-    for variant in "" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do
+    for variant in "" "${version}" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do
       if check_version $tool ${tool}${variant} $version; then
 	found="${version}"
 	break
@@ -46,7 +46,7 @@
   shift
   versions="$*"
   for version in $versions; do
-    for variant in "" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do
+    for variant in "" "${version}" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do
       if check_version $tool ${tool}${variant} $version; then
 	found="${variant}"
 	break

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVmo8/MAAZPfgEAQVeP//1YE
AAT////+UAO57gRrumXdrqhJSTU/RqninlPRM2pPINNT1NpA9QAGgJJEZCeQJqanqP1T1D9FNPCg
0HqDamgGISTCPVBtQ0HqBo9I0DygAAcwAEwABMAAAAABJJMk8p5U8VPNJhpTT9U9qnlNGhowmjJt
Iwy28AxOfqFucSKCNae3aeCBVuS0Q7rMC4xGyDMe8xPWJDXtoJCnvA9oybCLXJJ1VXTyhrMV9WDI
+CjDN5PVXMcEXj5jz2C3zLNnV49NVmluvAXYLvHw1vgMgYuOR+37RlpSWlHioCmX51jjzqqEFvF1
Gv2blilrsS7L4lpEp+Rurf80SilbNz109rhFA5A8VP5Nwu+wjF5sHVFDiggXw0an9HGwtFazahEe
rjObklZaj1OV1HCVALAniSKE/Hi6kdArJdFfhbSk1XAFYpKeCeqlwGpArJGmqUYCyHFS7bSyApwy
Kz2CvIrmVFzYsMNtrMSJMeZXvogVicda76J2HcaSZDTgMRcYFZnsHJ56C3kzgNWUWwcSNDYDyBNb
So3QN5XDNHV0p944kbSZSTio3ETiKDi1xI6AmQKoFpceijBUrVFEexnCFxxMe0wYX5Y13UBT0Nup
+ly9l4v1PDChM7k4GMskivibX01iiooGj1ztP2RLyAbTqMTnHLXwVthsCHL3L5Sg8ZZZ0PNKUi7l
U7fvNpeUjiV9bDRWKxGwoMODatEjRkFyyjcKEE3JMRZpci7PImqU0A8UtRqzLTO7Q1nFOW5kG4hL
YTAg43l9Nxy4mnKdUMITtTjyG/sxhPhsYnLOoETJcevLLJElpC/UpFnS4uFMBZIm2PjwKyxPA3hx
LSPflZPzHKPJ/YaOIv9uWPizgaLFA13kgmfbmEB/wLVUUuTBn3c76oXJLNiB2xflyT1VWtJRKMXT
rpClKNcGJ92q5mLPrWYpkVfpt0ZKFOmmKuTrJhLhpZ1pFzmCAGMOA/iSmGphArBhEZmMAaRw8Dcv
rr0yuq0DUKaTB73veiGaYJlYYuW54u7AGqC1ZlaZKHveoRwTy1RRDKRbPcUzjMYjIA6Mqukoolxx
tZPrsgVbHJUKyi8N+RUgpUHG1Jwu9/P7jqxhtRAtJSTFDXgMkyHUipLKZqTSB6ydoC89DKCX20pO
hZK98ZYlV2A8e5V1hKaYcm8ExSyiqOuTytkp0FidGX8w4Y5wsV17gkeVy5lXsFoFgua/C9faanHJ
Mu5zAzbBb307ToKPmFgGBiH/F3JFOFCQWajz8w==