merge of '08572570b3312090fa0da584f4b7b2272ac58cae'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:53:07 +0000 (16:53 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:53:07 +0000 (16:53 +0000)
     and '1054ca4965286d532ebc6789997a44625d410958'


Trivial merge