merge of 24f21a5b3e458f3905aa456dae8691117a730f78
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Apr 2006 09:48:01 +0000 (09:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 09:48:01 +0000 (09:48 +0000)
     and 4851cae94858387e98668d170b0a21c082ff7cc4


Trivial merge