merge of 9745a12b67075009baa19a1144d34090818e6904
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sun, 2 Jul 2006 14:36:52 +0000 (14:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Jul 2006 14:36:52 +0000 (14:36 +0000)
     and c7c469e8409b8827f209ce9715ed871a9c2a5226


Trivial merge