merge of 4a2c16678b05253a5736aa917a28e66052c746f8
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 24 Aug 2005 19:31:29 +0000 (19:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 19:31:29 +0000 (19:31 +0000)
     and beb1b8b2c854886cbbad1a336b492fa8b7ad78be


Trivial merge