merge of 86961384c74c6bc29d336fbabba45f0473a97806
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 13:41:26 +0000 (13:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 13:41:26 +0000 (13:41 +0000)
commitb1508ad8c67d53cd5b3de080f357f76a63e0cefc
treecdb1d67cb904776e4b0f031358891db039cd6583
parent0b51b1bb39b3d60444794861d3784d619d3f5729
parent2423e550a8d5f935e07525644f5f2e6d2cceaf95
merge of 86961384c74c6bc29d336fbabba45f0473a97806
     and 99ec1d02032e8ba7478bee3ac54278a178f159a3