Merge remote branch 'svn-vim' into vim
authorBjorn Winckler <bjorn.winckler@gmail.com>
Mon, 1 Mar 2010 18:26:14 +0000 (1 19:26 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Mon, 1 Mar 2010 18:26:14 +0000 (1 19:26 +0100)

Trivial merge