Commit from CrunchBang