merge of 0f708a1a283427a436a4dde390b7d5fdc54f35e6
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 31 Jul 2005 23:23:58 +0000 (23:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 23:23:58 +0000 (23:23 +0000)
     and b1872f89ec8b07b1e4d80e4ed9e0b397da5f4f3a


Trivial merge