merge of 2d7197eeafa133909e9e8460e7954cb93dfc840b
authorKoen Kooi <koen@openembedded.org>
Mon, 15 Aug 2005 22:52:40 +0000 (22:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Aug 2005 22:52:40 +0000 (22:52 +0000)
     and be25e7a6e0d2e4e3d6c910cc94bc112dfa979fed


Trivial merge