Merge branch 'master' into local_services
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Fri, 24 Sep 2010 11:20:51 +0000 (13:20 +0200)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Fri, 24 Sep 2010 11:20:51 +0000 (13:20 +0200)
commit4572886a348510f6c54262f77d9fb0f8dc614f16
tree63a9fedcbeef22b309b84ae6b62e510de969e054
parent8a45cfe4dae26c07e88489c8356583c700246288
parentba085737d6bcb76dba0b1ff3ea1563bfac28ab73
Merge branch 'master' into local_services

Conflicts:
zypp/parser/RepoFileReader.cc
zypp/parser/RepoFileReader.cc