merge of '0c093b26a4dcd73c59fdfd549e99d4e4d6ce6ff7'
authorDerek Young <dyoung@nslu2-linux.org>
Sun, 2 Mar 2008 21:50:50 +0000 (21:50 +0000)
committerDerek Young <dyoung@nslu2-linux.org>
Sun, 2 Mar 2008 21:50:50 +0000 (21:50 +0000)
     and 'ad750d608664d7708c21300ab3eed2feec262c22'


Trivial merge