merge of 23fbf27774beb8da3d4bc3672a8415bfd24eb369
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Feb 2006 00:11:18 +0000 (00:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Feb 2006 00:11:18 +0000 (00:11 +0000)
     and e36ab3ae9c4e81b92e9a4b650a37af9a6a4174cf


Trivial merge