Merge branch 'lro'
authorJeff Garzik <jeff@garzik.org>
Thu, 2 Mar 2006 19:26:30 +0000 (14:26 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 2 Mar 2006 19:26:30 +0000 (14:26 -0500)

Trivial merge