Merge commit 'snapshot-start' into stable
authorIan Beckwith <ianb@erislabs.net>
Mon, 8 Mar 2010 01:39:56 +0000 (01:39 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 8 Mar 2010 01:39:56 +0000 (01:39 +0000)
Conflicts:
ChangeLog
build-aux/gendocs.sh
lib/dirent.in.h
m4/inttypes.m4
m4/search_h.m4
m4/string_h.m4
m4/sys_select_h.m4
m4/sys_time_h.m4
m4/wchar.m4
modules/string
tests/test-getlogin_r.c


Trivial merge