merge of 2d74ab18755124460de464b7d2ee0ce76344837e
authorKoen Kooi <koen@openembedded.org>
Tue, 16 May 2006 10:20:18 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 10:20:18 +0000 (10:20 +0000)
     and 398443d538482a6003cb29221382acd4afbde19e


Trivial merge