From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 21 May 2008 20:56:42 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.41-WIP-0617~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0af709e52dd4952d78f051ea5c082437ee3412b;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint'

Conflicts:

	README
	version.h
---

c0af709e52dd4952d78f051ea5c082437ee3412b