merge of 20d82b867694bc656456a80553cb61e3496c6971
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 16:49:14 +0000 (16:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 16:49:14 +0000 (16:49 +0000)
     and 3218f01f2326060a12ef6708b1b8a120b220d5a9


Trivial merge