merge of 100af48176006080bc6eaf59f5e30c1da29c86c3
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 31 Jul 2005 14:27:01 +0000 (14:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 14:27:01 +0000 (14:27 +0000)
     and 17e420c5e347fcd369eb9354898c3e5ef2d059c6


Trivial merge