Merge branch 'master' of git://oss.sgi.com/xfs/cmds/xfsprogs

Fix up CHANGES mismerge due to the 3.0.1 vs 3.0.2 schism.

Conflicts:
	doc/CHANGES

diff --cc doc/CHANGES
index 82fd3be522654a269fa9c1f5f5c146997f9bcd49,ab894a011f338115afdfc7bf620807c1d796d3ad..d718dd4580366f480f0827ab0e3b0b4cee8c2bbf
--- 1/doc/CHANGES
--- 2/doc/CHANGES
+++ b/doc/CHANGES
@@@ -1,8 -1,4 +1,8 @@@
- xfsprogs-3.0.1 (16 April 2009)
 +xfsprogs-3.0.2 (6 May 2009)
 +      - Updates to Debian build process after recent autoconf tweaks.
 +      - Fix a couple of minor man page syntax issues.
 +
+ xfsprogs-3.0.1 (4 May 2009)
        - Update the Makepkgs script to generate proper source tarballs.
        - New project(5) and projid(5) man pages.
        - Fix extent array reallocation in the xfs_io bmap command,