merge of 33f5c37d2f8c2a6f5a242f167516efbcbc9ecf41
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 May 2006 19:20:44 +0000 (19:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 19:20:44 +0000 (19:20 +0000)
     and dbb8f5536fbc6e50532ff14d6db8e58ae21b0398


Trivial merge