Merge branch 'master' of ssh://terminus.zytor.com//pub/git/users/erwan/hdt
authorErwan Velu <erwanaliasr1@gmail.com>
Mon, 31 Jan 2011 21:16:33 +0000 (22:16 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Mon, 31 Jan 2011 21:16:33 +0000 (22:16 +0100)
commitdb3b0b8379613fdd32f791000d173e5411775291
treef78d62cbadfdaee9f909108fb275d1d3bbc9e53e
parentcb5d3c6e3d87b0897bc11cf2575b9d41cb9d22b7
parent353f83cc733202bd6601262db5c2ac14acda1ff0
Merge branch 'master' of ssh://terminus.zytor.com//pub/git/users/erwan/hdt

Conflicts:
com32/hdt/hdt-cli-acpi.c
com32/hdt/hdt-menu-acpi.c
com32/hdt/hdt-menu-acpi.c