Merge branch 'sis900-wol'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 03:47:48 +0000 (22:47 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 03:47:48 +0000 (22:47 -0500)

Trivial merge