Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Fri, 8 Jan 2010 05:17:35 +0000 (05:17 +0000)
committerIan Beckwith <ianb@erislabs.net>
Fri, 8 Jan 2010 05:17:35 +0000 (05:17 +0000)
Merge to start of new stable snapshot

Conflicts:
ChangeLog
build-aux/config.guess
m4/getugroups.m4
m4/unistd_h.m4
m4/unlink.m4


Trivial merge