merge of 126ec62999c60bc43412b0635388956112083a61
authorKoen Kooi <koen@openembedded.org>
Sat, 27 May 2006 14:12:44 +0000 (14:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 14:12:44 +0000 (14:12 +0000)
     and aedc32759fe92452f07cd25211ccc84ba92028ac


Trivial merge