merge of 5bbc6ec4525557db317977a31210230c82e55137
authorDavid Karlstrom <daka@thg.se>
Sun, 24 Jul 2005 22:50:25 +0000 (22:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 22:50:25 +0000 (22:50 +0000)
     and 784c05071a5b5065bf80e4deffcb6d20b1aef040


Trivial merge