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)
commitc022cb27332ddf93c90da2a50aaf79afb3de2cd4
treea0288104cf9c665b26b8e69c249e4f1bf0ce8ffb
parentc90ae4bfee186851ee9f11ebbd6aae5ec2cdde77
parenta31876f5227b3ecbd47d7932da34deb6cf57ca81
merge of 9581bce5c1996139a91c3c53f2d2c03079629ea0
     and f9406fd8ccc29de2dfdefc7d6826a351e50324dd