merge of 2e3b25afd1276eaa7c2205ada5c506c1a6e8df5e
authorKoen Kooi <koen@openembedded.org>
Sat, 8 Jul 2006 14:33:26 +0000 (14:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 14:33:26 +0000 (14:33 +0000)
     and 2eff0430ea1b3fe81d0bd31a6d70b1ac317bee6e


Trivial merge