From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 23 Dec 2010 00:00:21 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da2a5a4baede2a227d2da587eb74ceae66778fbc;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	resize/resize2fs.c
---

da2a5a4baede2a227d2da587eb74ceae66778fbc