Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 00:13:54 +0000 (19:13 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 00:13:54 +0000 (19:13 -0500)

Trivial merge