merge of 18e74576d6a6dbe1c24ecfa4f3a7d57f30e979db
authorRene Wagner <rw@handhelds.org>
Sat, 20 Aug 2005 12:59:23 +0000 (12:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Aug 2005 12:59:23 +0000 (12:59 +0000)
     and d4d1a8121b8f063ec17cda4da0bb104be219efd6


Trivial merge