merge of 11d7234c6c07e62a7ec6e5c77e57b47cbdafb16e
authorKoen Kooi <koen@openembedded.org>
Mon, 26 Jun 2006 18:08:28 +0000 (18:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Jun 2006 18:08:28 +0000 (18:08 +0000)
     and db0a543fe9e50611a979e08c263802aa2fc2b824


Trivial merge