merge of 1425776b25f87ca80f269f6305acef37ac3954ee
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 5 Feb 2006 16:37:20 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 16:37:20 +0000 (16:37 +0000)
     and f7d38069884135ea97e68eb9c203471935a6c3bf


Trivial merge