merge of '03bdeb5908ba2c0e4e89671cb543c5a9578e78f0'
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 15 Mar 2007 21:11:31 +0000 (21:11 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Thu, 15 Mar 2007 21:11:31 +0000 (21:11 +0000)
     and 'b784e8646c09bbe9782d75dc6593f3f90f0683af'


Trivial merge