merge of '79d76f976ca74f71f538f5c81a1e25b14ffe43f6'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 11:03:41 +0000 (11:03 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 11:03:41 +0000 (11:03 +0000)
     and 'b9ffe3b2fa4c42424206977c6be342c1305c83e7'


Trivial merge