From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 8 May 2011 03:24:55 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b18c5fd51e829e5fb1a434604d4373409379744b;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

b18c5fd51e829e5fb1a434604d4373409379744b