From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 5 Jul 2011 00:51:19 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0916~51
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f37901a22d618916b53105e39ff91a8bb84d67bc;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/tune2fs.c
---

f37901a22d618916b53105e39ff91a8bb84d67bc