Bug#371069: Partial fixes

[Otavio Salvador]

Hi,

I lack the need hardware for testing but I did some fixes in our SVN
repository.

I would like if someone could build and test it.

-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: otavio at debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://www.freedom.ind.br/otavio
---------------------------------------------
"Microsoft gives you Windows ... Linux gives
 you the whole house."