merge of 47f2334c425ce0824448c079cc45315c7b44a9f4
authorKoen Kooi <koen@openembedded.org>
Tue, 11 Oct 2005 22:20:40 +0000 (22:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Oct 2005 22:20:40 +0000 (22:20 +0000)
     and b0bdb0dccc8c606923f25783f066e37b46ceafbc


Trivial merge