Merge commit 'erwan-private/master' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 20 Mar 2009 02:15:00 +0000 (19:15 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 20 Mar 2009 02:15:00 +0000 (19:15 -0700)
commitf40b8b8f5f6674b7b4e092b43b32780a62ba5e3f
tree86e5e3ec7723aa4720b36f001147c9916c10877b
parent2c3d9eba8ad1715117bb30bc655cff3cbcebbfc9
parente94feba4b1844e34f27b6720157e886707cd6e00
Merge commit 'erwan-private/master' into for-erwan

Conflicts:

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