merge of 'e159af24ff18ed3b55b092ed9b90e7e60221c899'
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 10 Aug 2006 13:42:58 +0000 (13:42 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Thu, 10 Aug 2006 13:42:58 +0000 (13:42 +0000)
     and 'ebfa533fbc0b4ebe4011d0117987194f59487d33'


Trivial merge