merge of 70cb6f558d4561f1b9c50237e88fa887ccbdf228
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 25 Aug 2005 14:39:57 +0000 (14:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 14:39:57 +0000 (14:39 +0000)
     and b9177812c9369ebf75a9b853a8e9ed3176223f09


Trivial merge