merge of 683e48c12e6a8aa2b4e1245376904a4906e067dd
authorHolger Freyther <zecke@selfish.org>
Sat, 27 May 2006 16:12:57 +0000 (16:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 16:12:57 +0000 (16:12 +0000)
     and c74480da4ef27375297f2999a9e027c8b275546b


Trivial merge