Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=18472		2009-11-19 19:09:10 +00:00
..
autojump
bc
bfr
bogofilter
coreutils
coreutils-5
debootstrap
desktop-file-utils
dosfstools
eProver
ethtool
expect
fdupes
figlet
file
findutils
findutils-wrapper
fontforge
getopt
gnokii
gnuvd
gparted
grub
hddtemp
idutils
jdiskreport
kermit
keychain
less
man
man-db
mc
mcrl
mcrl2
mdbtools
memtest86
minicom
mssys
myhasktags
mysql2pgsql
parted
partition-manager
pg_top
pinentry
proxytunnel
psmisc
pv
relfs
remind
rlwrap
rrdtool
screen
shebangfix
slsnif
su
syslog-ng
system-config-printer
testdisk
time
timidity
ttf2pt1
ttmkfdir
units
uucp
wv
wv2
xclip
xmltv
xsel