merge of 6b9aad33efbe7d42956463905d36b5d886340224
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 17 Mar 2006 16:48:25 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 17 Mar 2006 16:48:25 +0000 (16:48 +0000)
     and c9370fe0b51a1422478e89483290e5776597d26c


Trivial merge