merge of 23a6ba326b8bc5b4996899473c171710e6bb6685
authorKoen Kooi <koen@openembedded.org>
Fri, 26 Aug 2005 14:23:15 +0000 (14:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 14:23:15 +0000 (14:23 +0000)
commit4b497373ffa67108a9ecad7578914d483e4a98b0
treeccd9f61b0436dbddd8b3d60e122a473bcc4f3f56
parentf95d29e62323783cf21dda2861b2b78d86c6f9b0
parentf6fd159b63403e8164eda485560fa113ba35935c
merge of 23a6ba326b8bc5b4996899473c171710e6bb6685
     and 41853f4a903b2c4a4541c45b19966ab1c9e72a08