Merge branch 'master' into upstream
Jeff Garzik [Tue, 29 Aug 2006 21:20:55 +0000 (17:20 -0400)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge