merge of c07983d563d6bb267abbabb4971b40387f9e16f4
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 20 May 2006 20:06:39 +0000 (20:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 20:06:39 +0000 (20:06 +0000)
     and df0016306331c3dc82088b0c31109e7841171b48


Trivial merge