Merge remote branch 'jukie/vim'
authorCarl Worth <cworth@cworth.org>
Sat, 28 Nov 2009 01:32:50 +0000 (17:32 -0800)
committerCarl Worth <cworth@cworth.org>
Sat, 28 Nov 2009 01:32:50 +0000 (17:32 -0800)

Trivial merge