merge of 21066969832f6a294ed9f0024ab410c98d0e1344
authorHolger Freyther <zecke@selfish.org>
Sun, 9 Apr 2006 13:47:43 +0000 (13:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Apr 2006 13:47:43 +0000 (13:47 +0000)
     and 5b29e14acf993df1ad5460db50d8a5f8fbee8b3c


Trivial merge