merge of 3e09771118f46dd5b429d9481e1be7f6a12628b8
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 22 Oct 2005 18:42:36 +0000 (18:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Oct 2005 18:42:36 +0000 (18:42 +0000)
     and c39d6bcb62a3013ec76c9d9c53de817504ff1a7e


Trivial merge