Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
..
2011-11-08 10:18:35 +00:00
2011-11-04 21:31:07 +00:00
2012-02-06 14:27:18 +00:00