merge of '339249f7db7afee978eb07ba05490a35e8bbca0c'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 26 Mar 2008 14:25:32 +0000 (14:25 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 26 Mar 2008 14:25:32 +0000 (14:25 +0000)
     and '4724e3c77b1dd0458ee0546ec9a8b88a8e779e01'

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge