Merge branch 'for-erwan' of ssh://erwan@terminus.zytor.com/pub/git/users/pam/hdt...
authorErwan Velu <erwan.velu@free.fr>
Mon, 13 Apr 2009 18:54:22 +0000 (20:54 +0200)
committerErwan Velu <erwan.velu@free.fr>
Mon, 13 Apr 2009 18:54:22 +0000 (20:54 +0200)
Conflicts:
com32/hdt/hdt-cli.c


Trivial merge