merge of 9581bce5c1996139a91c3c53f2d2c03079629ea0
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 28 Apr 2006 14:44:44 +0000 (14:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 14:44:44 +0000 (14:44 +0000)
     and f9406fd8ccc29de2dfdefc7d6826a351e50324dd


Trivial merge