Merge branch 'ui'
authorH. Peter Anvin <hpa@zytor.com>
Mon, 26 Jan 2009 02:53:04 +0000 (18:53 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 26 Jan 2009 02:53:04 +0000 (18:53 -0800)
commitffb58825da075663f576232b589a0372f0a8d658
tree7fc14704664ad137a9dd6a285d90dffdf927d597
parent735fcbbdab15d94b7ae76a96dc462979c45af44d
parentc323eacdaed0c315cb2d123fdd76e3109ac48737
Merge branch 'ui'

Conflicts:
NEWS
NEWS