Merge branch 'master' of gitorious.org:opensuse/libzypp
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Mon, 6 Dec 2010 10:08:47 +0000 (11:08 +0100)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Mon, 6 Dec 2010 10:08:47 +0000 (11:08 +0100)
1  2 
zypp/media/MediaCurl.cc

Simple merge