Merge branch 'maint' into next

Conflicts:
	debian/changelog
	version.h

diff --cc debian/changelog
index 7cc7561,3b51aaf..a1e8227
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,21 +1,27 @@@
- e2fsprogs (1.43~WIP-2012-08-02-1) unstable; urgency=low
++e2fsprogs (1.43~WIP-2012-09-21-1) unstable; urgency=low
 +
 +  * Add metadata checksum feature
 +
-  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 1 Aug 2012 20:55:56 -0400
++ -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 21 Sep 2012 12:55:16 -0400
++
+ e2fsprogs (1.42.6-1) unstable; urgency=low
+ 
+   * New upstream version
+   * Fix build dependencies to avoid requiring dc, and to allow
+     cross-building to work (Closes: #677497)
+   * Updated/fixed various man pages
+   * Mke2fs will now update its progress indicators at most once a second
+     to avoid overwhelming serial consoles.
+   * Resize2fs will support lazy_itable_init, speeding up off-line growth
+     of uninit_bg file systems.
+   * Resize2fs now supports on-line resizing 64-bit file systems beyond
+     16TB.  A number of bugs in resize2fs which prevented this have been
+     fixed.
+   * Resize2fs now correctly handles resizing 32-bit file systems to 16TB.
+   * Fixed a potential segfault in e2fsck when there is an I/O error
+     while reading the superblock.
+ 
+  -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 21 Sep 2012 12:14:41 -0400
  
  e2fsprogs (1.42.5-1) unstable; urgency=low
  

diff --cc lib/ext2fs/progress.c
index 432816b,1e791fe..c71d695
--- 1/lib/ext2fs/progress.c
--- 2/lib/ext2fs/progress.c
+++ b/lib/ext2fs/progress.c
@@@ -14,14 -14,10 +14,16 @@@
  #include "ext2fs.h"
  #include "ext2fsP.h"
  
+ #include <time.h>
+ 
  static char spaces[80], backspaces[80];
  
 +struct ext2fs_progress_ops ext2fs_numeric_progress_ops = {
 +      .init           = ext2fs_numeric_progress_init,
 +      .update         = ext2fs_numeric_progress_update,
 +      .close          = ext2fs_numeric_progress_close,
 +};
 +
  static int int_log10(unsigned int arg)
  {
        int     l;

diff --cc misc/mke2fs.c
Simple merge

diff --cc version.h
index ec80eaf,174104e..83a088f
--- 1/version.h
--- 2/version.h
+++ b/version.h
@@@ -7,5 -7,5 +7,5 @@@
   * file may be redistributed under the GNU Public License v2.
   */
  
 -#define E2FSPROGS_VERSION "1.42.6"
 +#define E2FSPROGS_VERSION "1.43-WIP"
- #define E2FSPROGS_DATE "1-Aug-2012"
+ #define E2FSPROGS_DATE "21-Sep-2012"