Peter Simons 02eaa57b56 merge latest changes from trunk ... svn path=/nixpkgs/branches/stdenv-updates/; revision=32270		2012-02-14 13:47:27 +00:00
..
applications	merge latest changes from trunk	2012-02-14 13:47:27 +00:00
build-support	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00
data
desktops
development	merge latest changes from trunk	2012-02-14 13:47:27 +00:00
games	svn merge ^/nixpkgs/trunk	2012-02-13 19:47:36 +00:00
lib
misc	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
os-specific	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00
servers	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00
shells
stdenv
test
tools	svn merge ^/nixpkgs/trunk	2012-02-13 19:47:36 +00:00
top-level	merge latest changes from trunk	2012-02-14 13:47:27 +00:00