b1dd63
Merge commit '0a58aceceb59f05d8d11071bf2c436026b2a6fd1' into f18 Conflicts: README.patches vim-update.sh vim.spec