merge of 482d0ac7ec1cff34c9fc7affc4b051abafb85e03
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 9 Jun 2006 13:20:35 +0000 (13:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Jun 2006 13:20:35 +0000 (13:20 +0000)
     and df1198a3d060cad27956be1a6653a6556adfe9dd


Trivial merge