merge of 63241dba297738b6afa3f2751b162d17545e2a23
authorRene Wagner <rw@handhelds.org>
Sun, 21 Aug 2005 16:06:51 +0000 (16:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 16:06:51 +0000 (16:06 +0000)
     and 8ba34c2a2418ae3ae68c35cd0c6a9b535ec1178b


Trivial merge