merge of '0f8135c65473df463f2188fa0dfa768a14732485'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:18:39 +0000 (16:18 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:18:39 +0000 (16:18 +0000)
     and '4583e7735dbb33cb243e9f3b88e60543e00521e3'


Trivial merge