merge of 30c43de0d10703530b40f3820110767c65fc2a3b
authorKoen Kooi <koen@openembedded.org>
Fri, 9 Dec 2005 09:33:24 +0000 (09:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Dec 2005 09:33:24 +0000 (09:33 +0000)
     and d510fe2c093aff12bc3223326057244c800701ad


Trivial merge