merge of 2fac7157f5cc7d55100976b026dbeea2d41eebcf
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 30 Mar 2006 16:46:10 +0000 (16:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Mar 2006 16:46:10 +0000 (16:46 +0000)
     and 73d1a07867a552420dc55bf6b9d96d09b572b670


Trivial merge