Merge branch 'master' into pierre
authorErwan Velu <erwan.velu@free.fr>
Sun, 22 Mar 2009 18:08:58 +0000 (19:08 +0100)
committerErwan Velu <erwan.velu@free.fr>
Sun, 22 Mar 2009 18:08:58 +0000 (19:08 +0100)
commit3c7f3585d8ddeb30cb314c153c8d7b57503635c6
treeb54c337da9a52e67fbf05cfa3e859d3a0dd5e14e
parent0cd10cd0b247c30315252a128bdc7bc58c02603d
parent4ed6ebda51d4de5cda5fb90334affad8eba66764
Merge branch 'master' into pierre

Conflicts:
com32/hdt/hdt-cli-dmi.c
com32/hdt/hdt-cli.c
com32/hdt/hdt-cli.h
com32/hdt/hdt-cli-dmi.c
com32/hdt/hdt-cli.c
com32/hdt/hdt-cli.h