merge of 29134267458b518b87fa720d106c0188db1b6131
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 1 Sep 2005 17:46:39 +0000 (17:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Sep 2005 17:46:39 +0000 (17:46 +0000)
     and 296ac2a5b3ca43f1af1caec04d2643a3970aecef


Trivial merge