merge of 2ba8efd35a14c2dca849205133efdd2ecd83c907
authorMichael Lauer <mickey@vanille-media.de>
Tue, 20 Jun 2006 22:38:20 +0000 (22:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Jun 2006 22:38:20 +0000 (22:38 +0000)
     and d43467c2202cf4bba65631e9cb48b580772f7fc1


Trivial merge