merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 30 Aug 2005 18:35:29 +0000 (18:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 18:35:29 +0000 (18:35 +0000)
     and bf33034c282dd64819d4e41c15ee67d96dd56337


Trivial merge