merge of 487e52f30ac1424e4299105affc248ed1bcb625e
authorKoen Kooi <koen@openembedded.org>
Tue, 25 Apr 2006 14:07:26 +0000 (14:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 14:07:26 +0000 (14:07 +0000)
     and 92f1863582beb464976477bbff8bf4941acbc8f1


Trivial merge