tree ebbdc877184df5896a89d291193029d730aadd85
parent efe0b401465a3ee836180614b5b435acbb84fc27
parent 58384b8fa81ce01221414a3603591b63e487609b
author Theodore Ts'o <tytso@mit.edu> 1279521461 -0400
committer Theodore Ts'o <tytso@mit.edu> 1279521461 -0400

Merge branch 'maint' into next

Conflicts:
	resize/extent.c