merge of 72702dc0f20d493c1f7ba7870f55f950538bb364
authorHolger Freyther <zecke@selfish.org>
Sat, 30 Jul 2005 17:28:12 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 17:28:12 +0000 (17:28 +0000)
     and 76fbcca84ea4f2ed154c217a5754da2d9296c711


Trivial merge