merge of 86a33c5fda130dcc0e2efc8590bdb14838b69ccd
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Apr 2006 08:33:37 +0000 (08:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 08:33:37 +0000 (08:33 +0000)
     and ea609963032334a5f70ba000c53d2b90d75be610


Trivial merge