merge of 4ed0964b486b99773aa438f582fa52d0b4e9b0d1
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Feb 2006 10:58:26 +0000 (10:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Feb 2006 10:58:26 +0000 (10:58 +0000)
commitfdc9958bc3e33f43ead639f6a3acef0f744f9c4b
tree58988df7cf6450d102604e5634ee8b8baa2d71e6
parentafe7e2eac325f8fd4c1380c5b27c96af3e5056a8
parent2347d050d2fd598540903e1769c28894c8e40e32
merge of 4ed0964b486b99773aa438f582fa52d0b4e9b0d1
     and 95868ff13ffd9c5a92e6e0ae4637b3e07e4a626d