merge of '08e70776677fa0f013e2fdebcb38400d33bbe8d4'
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 10 Aug 2006 13:05:05 +0000 (13:05 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Thu, 10 Aug 2006 13:05:05 +0000 (13:05 +0000)
     and '539b74462bd94e1453d57157f829d03019f912c8'


Trivial merge