From af640dee052611a636eee0f541ed907b0e18467f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Oct 2011 11:14:29 +0000
Subject: [PATCH] synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=30033