From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 21 Jul 2009 21:07:33 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5635e75c918866849746cf50d1a9a301c241fed4;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

5635e75c918866849746cf50d1a9a301c241fed4