Merge branch 'master' into fsc
authorH. Peter Anvin <hpa@zytor.com>
Wed, 6 Jan 2010 19:35:05 +0000 (11:35 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 6 Jan 2010 19:35:05 +0000 (11:35 -0800)
commit8739796206f1a69880ed3a223f3a108e050292f8
tree1700a9355374c3f7fd341e3ee5f1c08e76c7c740
parentfee8e52c0d3c9efb9566f673966f19683568d461
parent85c9fa1a8144edc6264bef88f5a283a4073988b9
Merge branch 'master' into fsc

Resolved Conflicts:
core/configinit.inc
version

Resolved Undetected Conflicts:
 core/ui.inc

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