Merge branch 'disklib' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 26 Apr 2009 21:35:56 +0000 (14:35 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 26 Apr 2009 21:35:56 +0000 (14:35 -0700)
Conflicts:

com32/hdt/hdt-common.c

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
1  2 
com32/hdt/hdt-cli-hdt.c
com32/hdt/hdt-common.c
com32/hdt/hdt-common.h

Simple merge
Simple merge
Simple merge