Merge branch 'master' into upstream
Jeff Garzik [Mon, 7 Aug 2006 10:38:41 +0000 (06:38 -0400)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge