merge of 4cc4648923ad8444dbe849ae4489ed6dbc605c47
authorHolger Freyther <zecke@selfish.org>
Sat, 10 Sep 2005 20:44:37 +0000 (20:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Sep 2005 20:44:37 +0000 (20:44 +0000)
     and b3eb9fb1e603dc46b493a195f8c6a4cb9a0a13e3


Trivial merge