manual merge of LennyLinux:mola-mola