merge of 13209ce004067a2d08ddc25d79c9e29087adf665
authorRene Wagner <rw@handhelds.org>
Sun, 17 Jul 2005 22:00:43 +0000 (22:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jul 2005 22:00:43 +0000 (22:00 +0000)
     and ca2bea4d24652633389a1f553be61c6b824f3b72


Trivial merge