merge of 1454ffff5c84818f2bdff284ac00c3f7fe048b81
authorRene Wagner <rw@handhelds.org>
Fri, 7 Oct 2005 12:28:17 +0000 (12:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 12:28:17 +0000 (12:28 +0000)
     and caf25ee131654e196a9fa7443662d2351e74a8f7


Trivial merge