Merge branch 'pxerom-pmm'
authorMichael Brown <mcb30@etherboot.org>
Tue, 11 Mar 2008 16:11:51 +0000 (16:11 +0000)
committerMichael Brown <mcb30@etherboot.org>
Tue, 11 Mar 2008 16:11:51 +0000 (16:11 +0000)

Trivial merge