manual merge of LennyLinux:mola-mola
Style changes