Merge commit 'andytim/freedos'
authorH. Peter Anvin <hpa@zytor.com>
Fri, 31 Jul 2009 05:40:06 +0000 (22:40 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 31 Jul 2009 05:40:06 +0000 (22:40 -0700)

Trivial merge