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)
     and 99ec1d02032e8ba7478bee3ac54278a178f159a3


Trivial merge