merge of 0b09834f6c4f44d4145ed8d06e17ecf1d1c48029
authorMichael Lauer <mickey@vanille-media.de>
Mon, 17 Apr 2006 13:44:06 +0000 (13:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Apr 2006 13:44:06 +0000 (13:44 +0000)
     and e96a56e5b78296091533ce1d0a3856405435e1ec


Trivial merge