Merge commit 'laptop/master'
authorMichael Brown <mcb30@etherboot.org>
Tue, 22 Jan 2008 18:57:01 +0000 (18:57 +0000)
committerMichael Brown <mcb30@etherboot.org>
Tue, 22 Jan 2008 18:57:01 +0000 (18:57 +0000)

Trivial merge