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)
commit692679fcbebba0095bae0f1f1a99bd1f0f5a0476
tree5d6fcd0f54645235bf442479789550168cf42f15
parentd9735fffe9e73de91b7be2efa4c53a016edc22c9
parent4fc10daa05477586fea99b6b3ca02a87d1102fa1
Merge commit 'snapshot-start' into stable

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