merge of 94e87f750741788f0f284fbad40cb6eddee8f689
authorKoen Kooi <koen@openembedded.org>
Thu, 6 Jul 2006 13:01:47 +0000 (13:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 13:01:47 +0000 (13:01 +0000)
     and 9fcf759108403d55361b6910f3dbc57f0fa9431d


Trivial merge