merge of bb045a5a17fc33253d0065173055ac1656458613
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 7 Aug 2005 19:52:14 +0000 (19:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 19:52:14 +0000 (19:52 +0000)
     and bbc23020a7627395141c2b93697ae9ccd1ea4a08


Trivial merge