Merge commit 'origin/mdc-working'
authorMichael Brown <mcb30@etherboot.org>
Wed, 21 Nov 2007 15:35:08 +0000 (15:35 +0000)
committerMichael Brown <mcb30@etherboot.org>
Wed, 21 Nov 2007 15:35:08 +0000 (15:35 +0000)

Trivial merge