Merge branch 'maint' into next

Conflicts:
	RELEASE-NOTES
	version.h

diff --cc RELEASE-NOTES
index c9dd876,ebd345a..20470d7
--- 1/RELEASE-NOTES
--- 2/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@@ -1,26 -1,12 +1,32 @@@
- E2fsprogs 1.42.7 (January 15, 2013)
 +E2fsprogs 1.43-WIP (September 22, 2012)
 +=======================================
 +
 +Add support for the ext4 metadata checksum feature.
 +
 +Check to make sure file system features which can not be supported by
 +HURD are not enabled if the file system is created to be
 +HURD-compatible.
 +
 +
 +Programmer's Notes
 +------------------
 +
 +Reduce the use of libc functions in libext2fs that may not be present
 +in the boot loader environment, at least for those functions that are
 +needed by boot loadsers such as yaboot.
 +
 +Support for the MMP feature can now be disabled at compile time.
 +
 +
+ E2fsprogs 1.42.7 (January 21, 2013)
  ===================================
  
+ Add warnings to mke2fs, resize2fs, and tune2fs that the bigalloc and
+ quota features are still under development.  For more information
+ please see:
+     * https://ext4.wiki.kernel.org/index.php/Bigalloc
+     * https://ext4.wiki.kernel.org/index.php/Quota
+ 
  Add some new options to filefrag from Lustre's patches to e2fsprogs:
      * add -k option to print extents in kB-sized units (like df -k)
      * add -b {blocksize} to print extents in blocksize units

diff --cc debian/changelog
index d36496e,3d0463e..bb075d5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -48,14 -51,8 +51,14 @@@ e2fsprogs (1.42.7-1) unstable; urgency=
    * Update Czech, Dutch, French, German, Polish, Sweedish, and
      Vietnamese translations
  
-  -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 15 Jan 2013 22:31:25 -0500
+  -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 21 Jan 2013 21:52:58 -0500
  
 +e2fsprogs (1.43~WIP-2012-09-22-1) unstable; urgency=low
 +
 +  * Add metadata checksum feature
 +
 + -- Theodore Y. Ts'o <tytso@mit.edu>  Sat, 22 Sep 2012 21:50:20 -0400
 +
  e2fsprogs (1.42.6-1) unstable; urgency=low
  
    * New upstream version

diff --cc lib/ext2fs/gen_bitmap64.c
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge

diff --cc version.h
index fd3ee9d,5489b5b..10be88d
--- 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.7"
 +#define E2FSPROGS_VERSION "1.43-WIP"
- #define E2FSPROGS_DATE "15-Jan-2013"
+ #define E2FSPROGS_DATE "21-Jan-2013"