Merge branch 'classmate' into release
Len Brown [Thu, 24 Dec 2009 06:17:31 +0000 (01:17 -0500)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge