merge of af4df6cf6c1c2920365147ec393e688fdb85b6de
authorKoen Kooi <koen@openembedded.org>
Sat, 13 May 2006 18:27:19 +0000 (18:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 18:27:19 +0000 (18:27 +0000)
commit348f2ded2310934f32774fce605625e2976a2d5e
tree7d9201971ddf6c5b7f9dfdb87ddf99e247071ebf
parent86263c55f7025aa4d0e7c1619a28ed2459d97897
parentbbd7bd75f82d177e6ea894672148a76f0b0e6d92
merge of af4df6cf6c1c2920365147ec393e688fdb85b6de
     and c8459c74f176dc141188b488b5c3e56beb6ebf13