Merge remote branch 'svn-vim' into vim
authorBjorn Winckler <bjorn.winckler@gmail.com>
Thu, 18 Feb 2010 17:59:49 +0000 (18 18:59 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Thu, 18 Feb 2010 17:59:49 +0000 (18 18:59 +0100)

Trivial merge