Merge branch 'master' into local_services

Conflicts:
	zypp/parser/RepoFileReader.cc

diff --cc zypp/parser/RepoFileReader.cc
index 9196baf,d915757..9e6ae21
--- 1/zypp/parser/RepoFileReader.cc
--- 2/zypp/parser/RepoFileReader.cc
+++ b/zypp/parser/RepoFileReader.cc
@@@ -73,9 -76,23 +75,22 @@@ namespace zyp
            info.setKeepPackages( str::strToTrue( it->second ) );
          else if ( it->first == "service" )
            info.setService( it->second );
-           else
+           else if ( it->first == "proxy" )
+           {
+           if (it->second != "_none_" )
+             { 
+               str::regex ex("^(.*):([0-9]+)$");
+               str::smatch what;
+               if(str::regex_match(it->second, what, ex)){
+                url.setQueryParam("proxy", what[1]);
+                url.setQueryParam("proxyport", what[2]);
+               }
+             }
+           } else
              ERR << "Unknown attribute in [" << *its << "]: " << it->second << " ignored" << endl;
          }
 -
+         if (url.isValid())
+             info.addBaseUrl(url);
          info.setFilepath(is.path());
          MIL << info << endl;
          // add it to the list.