merge of 9a80eb5deb2b5f31c20a1da2065134687e7ef5eb
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sun, 30 Apr 2006 13:03:55 +0000 (13:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 13:03:55 +0000 (13:03 +0000)
     and 8efef2b3aa52e815abc0ab9f1df2391b3ffb9202


Trivial merge