Merge branch 'master' into upstream
Jeff Garzik [Tue, 19 Sep 2006 19:13:45 +0000 (15:13 -0400)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge