Merge commit '039ae97'
authorIan Beckwith <ianb@erislabs.net>
Fri, 8 Jan 2010 04:18:56 +0000 (04:18 +0000)
committerIan Beckwith <ianb@erislabs.net>
Fri, 8 Jan 2010 04:18:56 +0000 (04:18 +0000)
Merge up to commit before tab/space changes

Conflicts:
ChangeLog
build-aux/config.guess
lib/unistd.in.h
m4/chown.m4
m4/getgroups.m4
m4/getugroups.m4
m4/unistd_h.m4
m4/unlink.m4
tests/test-getgroups.c


Trivial merge