merge of f17d3087897a984c0e341c5bdec44b96a96c2bc5
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 22 Jan 2006 12:53:24 +0000 (12:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 12:53:24 +0000 (12:53 +0000)
     and f9b462770824431301ae59aeb7968ecd519a5121


Trivial merge