merge of 2be870315ff8317d0e0cd799e186d6bf854356f9
authorRene Wagner <rw@handhelds.org>
Fri, 7 Oct 2005 20:29:55 +0000 (20:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 20:29:55 +0000 (20:29 +0000)
     and 99a817d60abba6fe4aa542787b4938ff8ae2470f


Trivial merge