merge of '8bfdfaf4e5f3e1114fa91502c9eafe85c21a06dd'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 1 Sep 2006 13:06:11 +0000 (13:06 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 1 Sep 2006 13:06:11 +0000 (13:06 +0000)
     and 'ce48c156b1ce78cf4d83f981c103ec2f8d2b529e'


Trivial merge