merge of 8f860e5acf5f3449ded79e9bc876a6b5b70cbc47
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 13:56:01 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 13:56:01 +0000 (13:56 +0000)
     and fde5a287da3f85a26581cb7c6634cc8fb3ca4a59


Trivial merge