merge of b9b66b086ae9b09598a4e46d6864d9ef07f3cc0d
authorMatthias Hentges <oe@hentges.net>
Thu, 18 May 2006 11:53:05 +0000 (11:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 11:53:05 +0000 (11:53 +0000)
commitc199c1193e678b2657af0aaf9d0446799f9962f4
treea5ee3d15915e22562de903aff23e9dd5b0f44434
parent0d2dfbd66a736fa2cc5ef5f0cf31203d95463958
parent5c2b9eec4c66370c8e287766d522c168ceb28fc2
merge of b9b66b086ae9b09598a4e46d6864d9ef07f3cc0d
     and f46af8d8602581214b59314f71fbd9fcdfda0fef