From: Ian Beckwith <ianb@erislabs.net>
Date: Mon, 8 Mar 2010 01:39:56 +0000 (+0000)
Subject: Merge commit 'snapshot-start' into stable
X-Git-Tag: stable/20100308~28
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=692679fcbebba0095bae0f1f1a99bd1f0f5a0476;p=gnulib.git

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
---

692679fcbebba0095bae0f1f1a99bd1f0f5a0476