merge of 'a70eb00abecc56b2732841f765ef8ad1a5bfd8d8'
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 11 Sep 2006 09:49:31 +0000 (09:49 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Mon, 11 Sep 2006 09:49:31 +0000 (09:49 +0000)
     and 'f381f85181c143ee817eed25326a5e226729146d'


Trivial merge