merge of 626d9cf0d974243e86609b2dc64c3da55ebf97c9
authorMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jul 2005 21:23:39 +0000 (21:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Jul 2005 21:23:39 +0000 (21:23 +0000)
     and 69c4e49fd744532fd81f2b84827358e61dca53f7


Trivial merge