Merge branch 'vim'
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 11 Aug 2010 09:56:13 +0000 (11 11:56 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 11 Aug 2010 09:56:13 +0000 (11 11:56 +0200)

Trivial merge