merge of a43e775504bf8b451ce3b336be11741fc47f98a2
authorHolger Freyther <zecke@selfish.org>
Sat, 27 May 2006 18:34:06 +0000 (18:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 18:34:06 +0000 (18:34 +0000)
     and eab2d205174672b344c05acab449541e7ed29008


Trivial merge