merge of 22b6c89379f44959daad0672b60b3b2775b9364a
authorRene Wagner <rw@handhelds.org>
Fri, 29 Jul 2005 21:17:08 +0000 (21:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 21:17:08 +0000 (21:17 +0000)
     and a9d332834a83bff1778ad969b7e1514a83a3c137


Trivial merge