merge of 9e87109e716f77df8d97648a6db285fa5a2f8a95
authorHolger Freyther <zecke@selfish.org>
Sat, 8 Jul 2006 21:29:51 +0000 (21:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 21:29:51 +0000 (21:29 +0000)
     and a6602b9dd64190727c29e6f38e0d7addac46299b


Trivial merge