merge of 0e0330b1ab6021531dd2672734314cafd639c05a
authorMichael Lauer <mickey@vanille-media.de>
Thu, 18 May 2006 16:43:11 +0000 (16:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 16:43:11 +0000 (16:43 +0000)
     and 1cc5c1036de76301e8e3356118ad46f2a94a8fb2


Trivial merge