merge of 1b89afb60b39052c2a305d2b4ea3aed76b0d7a59
authorKoen Kooi <koen@openembedded.org>
Fri, 3 Mar 2006 10:45:05 +0000 (10:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Mar 2006 10:45:05 +0000 (10:45 +0000)
     and f07649d527a990550c36b2ffb98b85bb7257636f


Trivial merge