Merge branch 'viro'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 19:17:05 +0000 (14:17 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 19:17:05 +0000 (14:17 -0500)

Trivial merge