merge of '6c93a8de1538e8bdc646a20349816533c039982f'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 15:52:37 +0000 (15:52 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 15:52:37 +0000 (15:52 +0000)
     and '6d8ba6bbba365608edee9d1c140c3b5efbad8ab5'


Trivial merge