merge of a1f958bfb17d37993e7a48aa74996ba57455f0da
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 31 Aug 2005 19:43:44 +0000 (19:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Aug 2005 19:43:44 +0000 (19:43 +0000)
     and f3ece6ea75e5b528c7e2e25b3510a0dd029cb823


Trivial merge