2 commits

Author	SHA1	Message	Date
Yury G. Kudryashov	da57804fff	Merged with trunk again ... svn path=/nixpkgs/branches/stdenv-updates/; revision=10267	2008-01-23 18:11:03 +00:00
Michael Raskin	43b208bbb9	Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant) ... svn path=/nixpkgs/trunk/; revision=9613	2007-11-09 13:54:02 +00:00