merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Apr 2006 22:15:00 +0000 (22:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:15:00 +0000 (22:15 +0000)
     and 1a727f78bc6a4e9e47da2fa7480e59efc5555960


Trivial merge