merge of 1543b56c9f718bb8dbd807f80307b339da1a07a6
authorRene Wagner <rw@handhelds.org>
Sun, 17 Jul 2005 21:31:03 +0000 (21:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jul 2005 21:31:03 +0000 (21:31 +0000)
     and a2850b44943ff1c8edcddd42a9ef5264824fb422


Trivial merge