Merge remote-tracking branch 'origin/master' into lwip
authorH. Peter Anvin <hpa@zytor.com>
Tue, 26 Apr 2011 03:23:08 +0000 (20:23 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 26 Apr 2011 03:23:08 +0000 (20:23 -0700)
commit57b7af7df6599a8cdb318d7adeda1cd6fb981626
tree133d3559a44655f16e91dfb0b33618f34945f78c
parent6e57f2115b84c073ccc94de55cf0e7367335c422
parentfaf815967c276bab95989d22a62b8378d7ebf6f3
Merge remote-tracking branch 'origin/master' into lwip

Resolved Conflicts:
NEWS

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
NEWS
core/ui.inc