Merge branch 'vim'
authorMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 13 Jun 2010 17:00:20 +0000 (13 19:00 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 13 Jun 2010 17:00:20 +0000 (13 19:00 +0200)

Trivial merge