merge of aa6f9aaabdcd4ae0fc3588b296bfb909b1deb0fa
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Apr 2006 15:32:32 +0000 (15:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 15:32:32 +0000 (15:32 +0000)
commitcea4c3d023db29f9ddf75dba403262dd9932d1f7
tree0fcddffc35ab78892f24fa642deef113b1e679e7
parentcf48a26def1b006524f244ab18ee892ab2932510
parent9bcca595397feb60a1bcd3a485bb6680e62c636b
merge of aa6f9aaabdcd4ae0fc3588b296bfb909b1deb0fa
     and f0eb2ff6d879b69c095726d4650ab88be6b557e4