Merge branch 'master', remote branch 'origin' into chouffe
commitce3db882c2cd0fa5d591125bc5b43d201930da5a
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 26 May 2010 20:46:36 +0000 (26 22:46 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 26 May 2010 20:46:36 +0000 (26 22:46 +0200)
treef8a640d7a7df146b358f0cffb829078f68fb9fac
parent0c890f2eda9f5f4869c9a4477ce2b6ef2b49761e
parent08b3602db548775ca819780de77686a186156ec7
Merge branch 'master', remote branch 'origin' into chouffe
com32/hdt/hdt-cli-vpd.c
com32/hdt/hdt-cli.c
com32/hdt/hdt-cli.h
com32/hdt/hdt-common.c
com32/hdt/hdt-common.h
com32/hdt/hdt-menu.c
com32/hdt/hdt-menu.h