Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=24429		2010-10-23 14:52:21 +00:00
..
audio	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
display-managers/slim
editors	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
graphics
misc	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
networking	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
office
science
taxes
version-management	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
video	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
virtualization
window-managers	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00