Signed-off-by: Austin Seipp <aseipp@pobox.com>
svn path=/nixpkgs/trunk/; revision=32301
svn path=/nixpkgs/trunk/; revision=12696