merge of 4a65e17c0fdaf3ba0d74238ffc7bf69e9d318fb8
authorHolger Freyther <zecke@selfish.org>
Sat, 10 Sep 2005 17:00:49 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Sep 2005 17:00:49 +0000 (17:00 +0000)
     and 7c515448f5eff831d72049c45482b13123faf78d


Trivial merge