Merge commit 'smcv/updated'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 27 Jan 2009 01:05:36 +0000 (20:05 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 27 Jan 2009 01:05:36 +0000 (20:05 -0500)

Trivial merge