merge of '3e1adbc3c19ac71287b5a3e6200f3fe6bde5c106'
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 11 Sep 2006 08:34:39 +0000 (08:34 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Mon, 11 Sep 2006 08:34:39 +0000 (08:34 +0000)
     and 'd9037235184b56c405c27cb611e52d27e7879173'


Trivial merge