merge of 3a6c0a29d29ed10272278e0c212ee87508ffe416
authorMichael Lauer <mickey@vanille-media.de>
Sat, 22 Apr 2006 21:11:33 +0000 (21:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Apr 2006 21:11:33 +0000 (21:11 +0000)
     and 3d32d5cfdac5307f5ee1b8a7f9cf0f1c79278f03


Trivial merge