Merge commit 'erwan/master' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 17 Apr 2009 21:55:12 +0000 (14:55 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 17 Apr 2009 21:55:12 +0000 (14:55 -0700)
commita9d9adb8b91ea55007cbf5873ec322bca9c1d012
treec2878654e22107c1551a0b886fb2b6c42f07efba
parentcb41ba728891e20af42d436526fbcd8a4a33ab5a
parentad9889e2309786738006c6c898fe52a395777836
Merge commit 'erwan/master' into for-erwan

Conflicts:
com32/hdt/hdt-cli-hdt.c
com32/hdt/hdt-cli.c
com32/hdt/hdt-cli-cpu.c
com32/hdt/hdt-cli-dmi.c
com32/hdt/hdt-cli-hdt.c
com32/hdt/hdt-cli-kernel.c
com32/hdt/hdt-cli-pci.c
com32/hdt/hdt-cli-pxe.c
com32/hdt/hdt-cli-syslinux.c
com32/hdt/hdt-cli-vesa.c
com32/hdt/hdt-cli.c