Merge branch 'develop'

.gitignore

ChangeLog

Makefile.in

Rakefile

aclocal.m4

app/Makefile.in

app/cdi.c

app/printinfo.h

autogen.sh

config/.rake.ralf

config/compile

config/config.guess

config/config.sub

config/default

config/depcomp

config/install-sh

config/ltmain.sh

config/missing

config/mkinstalldirs

configure