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)
commitbaaa1ac2e15a3ab2152bc510a8059c0cd763b34d
treee334781d4696630d5adbe6c9158303cc227078a5
parentd1c432c5b851c7a8c81cc5f9c88323bfc714deb1
parentd72bfe6108c5104bb095f1c3f9f35885ddf8da88
Merge branch 'for-erwan' of ssh://erwan@terminus.zytor.com/pub/git/users/pam/hdt-pierre into pam

Conflicts:
com32/hdt/hdt-cli.c