merge of 64742a6240c7bfc0d8e2211cc677ed7556a6ddf8
authorccsmart <ccsmart@smartpal.de>
Sat, 16 Jul 2005 13:19:11 +0000 (13:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Jul 2005 13:19:11 +0000 (13:19 +0000)
     and 685decee8e00db19102306be91759691218d20b5


Trivial merge