merge of '4cebc9fa43c5fb8dd332e091469cb2442c972ee8'
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 10 Mar 2007 00:40:40 +0000 (00:40 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sat, 10 Mar 2007 00:40:40 +0000 (00:40 +0000)
     and 'c244a1e89df0e3ca27b127211ac2cb3a15ab39f9'


Trivial merge