merge of 178f3f0b13daf4d30ab59b4d784ffc9784e60fe3
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Mar 2006 12:48:24 +0000 (12:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Mar 2006 12:48:24 +0000 (12:48 +0000)
     and ac0da6aa2f71fa6df7ee8952103394d2b4b012ab


Trivial merge