merge of 287509423a7ccc469c088f6b92bbdfec0edeadee
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 14 Aug 2005 14:50:12 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 14:50:12 +0000 (14:50 +0000)
     and 407eb0296d350c9cc97e2b25538dc773ded42ce9


Trivial merge