Merge commit 'erwan-private/master' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 22 Mar 2009 04:51:22 +0000 (21:51 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 22 Mar 2009 04:51:22 +0000 (21:51 -0700)
commit0cd10cd0b247c30315252a128bdc7bc58c02603d
treec80462a9be357761ada24b767009e305d7858934
parent28fd82d6689537c497d8b5e01c69e70909a9ba8e
parentc9638ff9ac818ae744d5d66885f431f5b4e2ba93
Merge commit 'erwan-private/master' into for-erwan

Conflicts:

com32/hdt/hdt-cli.c
com32/hdt/hdt-cli.h
com32/hdt/hdt-cli-hdt.c
com32/hdt/hdt-cli.c
com32/hdt/hdt-cli.h