merge of 69f5e6634ad41e14c392c5aca06f4c4516ab4f21
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 Aug 2005 15:41:09 +0000 (15:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Aug 2005 15:41:09 +0000 (15:41 +0000)
     and e77aaa7cc80bddb255c4e859e17727dc070660df


Trivial merge