merge of c6793bc8f547d1b4e917a79763199fc071a0e1b5
authorKoen Kooi <koen@openembedded.org>
Tue, 16 May 2006 11:49:41 +0000 (11:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 11:49:41 +0000 (11:49 +0000)
     and dc664fa6a8262e96a53d1340bc3cffa5af8e14c8


Trivial merge