Merge commit 'smcv/comments'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 20 Dec 2008 22:58:56 +0000 (17:58 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 20 Dec 2008 22:58:56 +0000 (17:58 -0500)

Trivial merge