merge of 3ac4779a56bf9130aadc5166d793c061e945e4eb
authorKoen Kooi <koen@openembedded.org>
Tue, 1 Nov 2005 11:42:07 +0000 (11:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Nov 2005 11:42:07 +0000 (11:42 +0000)
     and e90052e869148cbad322c7a3e0db7ff65b671002


Trivial merge