merge of 15e035df7fe4e06f903b284d02d9093184c03e78
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 21:41:31 +0000 (21:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:41:31 +0000 (21:41 +0000)
     and 1fac386ef241a1a19317045e669c3c4d038c2996


Trivial merge