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)
commit87c5f6fccee477f7e2c67ea4c95e51a3afd83a41
treeda75452a135937ed669c93fdf6064ba334275146
parentec60d8959e16a743f09704c397931f2621f511ae
parent8d8eda4eab3d2801251daf4eb31756c3595e2fc6
Merge branch 'stable'

Merge to start of new stable snapshot

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