Merge commit 'indolent/natsemi'
authorMichael Brown <mcb30@etherboot.org>
Sun, 15 Jul 2007 01:21:55 +0000 (02:21 +0100)
committerMichael Brown <mcb30@etherboot.org>
Sun, 15 Jul 2007 01:21:55 +0000 (02:21 +0100)

Trivial merge