merge of de843404287b36479dc45ace9ce134cef2ab6e93
authorKoen Kooi <koen@openembedded.org>
Sun, 19 Feb 2006 10:28:18 +0000 (10:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Feb 2006 10:28:18 +0000 (10:28 +0000)
     and f101befff140631d2a4b3081922d2d30610604cf


Trivial merge