merge of 36c85029caf52a5bdf60cd12bee0ef045cf0937b
authorKoen Kooi <koen@openembedded.org>
Wed, 3 May 2006 13:49:50 +0000 (13:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 13:49:50 +0000 (13:49 +0000)
     and 78a66f0dabbef07f6cf0dae7150a8f3cd22f6ebf


Trivial merge