merge of 'e483dba7ba282bfa85b0013f80f8cb08cdc09e8c'
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 11 Sep 2006 09:12:56 +0000 (09:12 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Mon, 11 Sep 2006 09:12:56 +0000 (09:12 +0000)
     and 'ff6f66dceec5bbb396856d2556a977d4b646133e'


Trivial merge