merge of 05bec92e5e8bff191f23ef22b4602550b92610c6
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 5 Mar 2006 12:43:12 +0000 (12:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Mar 2006 12:43:12 +0000 (12:43 +0000)
     and e30ba676fb1f8f84ea8357be0d17862f234f3879


Trivial merge