merge of c1c5f45706391426e8869790b447469783a6e15d
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 7 Sep 2005 13:01:43 +0000 (13:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 13:01:43 +0000 (13:01 +0000)
     and ddbf7177e01d412de874a56229d7f53dfa2c0d2a


Trivial merge