merge of '2283d6d9e723829fa3f8206557ade078993a8e80'
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 30 Sep 2006 10:18:30 +0000 (10:18 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sat, 30 Sep 2006 10:18:30 +0000 (10:18 +0000)
     and 'b98ae84398e0cce519822aa156ec0ef1d5de9794'


Trivial merge