Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim

Conflicts:
	vim.spec

vim-7.2-elinks-parameter-518791.patch

@@ -1,12 +0,0 @@
-diff -up vim72/runtime/autoload/netrw.vim.elinksparm vim72/runtime/autoload/netrw.vim
---- vim72/runtime/autoload/netrw.vim.elinksparm	2009-12-03 13:08:10.000000000 +0100
-+++ vim72/runtime/autoload/netrw.vim	2009-12-03 13:08:27.000000000 +0100
-@@ -88,7 +88,7 @@ if !exists("g:netrw_http_cmd")
-  if executable("elinks")
-   let g:netrw_http_cmd = "elinks"
-   if !exists("g:netrw_http_xcmd")
--   let g:netrw_http_xcmd= "-dump >"
-+   let g:netrw_http_xcmd= "-source >"
-   endif
-  elseif executable("links")
-   let g:netrw_http_cmd = "links"

vim.spec

@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -1141,10 +1141,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Mon Aug 29 2011 Karsten Hopp <karsten@redhat.com> 7.3.244-1
+* Mon Aug 29 2011 Karsten Hopp <karsten@redhat.com> 7.3.244-4
 - Remove old patched files. (Ricky Zhou <ricky@fedoraproject.org>)
   (bugzilla #709456)
 
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2:7.3.244-3
+- Perl mass rebuild
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2:7.3.244-2
+- Perl mass rebuild
+
 * Mon Jul 11 2011 Karsten Hopp <karsten@redhat.com> 7.3.244-1
 - patchlevel 244