merge of 1d77ddb01c67323571ab7dbd94f8697e79915a6c
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 24 Aug 2005 19:37:43 +0000 (19:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 19:37:43 +0000 (19:37 +0000)
     and ef94291fe767aba5f533204f38ff66f144dba2ff


Trivial merge