svn path=/nixpkgs/trunk/; revision=502
* Some cleanups. svn path=/nixpkgs/trunk/; revision=482
svn path=/nixpkgs/trunk/; revision=470