changes proposed by tommy[D] \#gentoo-sunrise@freenode