merge of 22c05a7492aef8241f0667aacb228ac303fe8642
authorHolger Freyther <zecke@selfish.org>
Sat, 15 Jul 2006 20:39:00 +0000 (20:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Jul 2006 20:39:00 +0000 (20:39 +0000)
     and dbdf30b8d0a212453d479c749ad35131fbb26cd9


Trivial merge