merge of 3aa7e8c00e162c64558b2b2bf8171f7887f4725b
authorMichael Lauer <mickey@vanille-media.de>
Thu, 20 Apr 2006 22:56:57 +0000 (22:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Apr 2006 22:56:57 +0000 (22:56 +0000)
     and d35a0eeacf900a9c366ef434552e49f6cf777bb7


Trivial merge