svn path=/nixpkgs/trunk/; revision=33506
Patch submitted by Phil Hagelberg <technomancy@gmail.com>. svn path=/nixpkgs/trunk/; revision=31992
svn path=/nixpkgs/trunk/; revision=31655