merge of 2692c20b64cebd9a996a3ec7d793938f235c2cd6
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 31 Jul 2005 13:52:18 +0000 (13:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 13:52:18 +0000 (13:52 +0000)
     and 84ca6b48d0e2960ee88c5a4d6c227b9cc53e4d46


Trivial merge