Merge branch 'master' of gitorious.org:opensuse/libzypp

Conflicts:
	zypp/media/MediaCurl.cc

diff --cc zypp/media/MediaCurl.cc
index 71d729a,5d780b7..086bdf1
--- 1/zypp/media/MediaCurl.cc
--- 2/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@@ -390,6 -376,10 +391,10 @@@ static const char *const agentString(
      } \
    } while ( false )
  
 -#define SET_OPTION_LONG(opt,val) SET_OPTION(opt,(LONG)val)
+ #define SET_OPTION_OFFT(opt,val) SET_OPTION(opt,(curl_off_t)val)
++#define SET_OPTION_LONG(opt,val) SET_OPTION(opt,(long)val)
+ #define SET_OPTION_VOID(opt,val) SET_OPTION(opt,(void*)val)
+ 
  MediaCurl::MediaCurl( const Url &      url_r,
                        const Pathname & attach_point_hint_r )
      : MediaHandler( url_r, attach_point_hint_r,