merge of 1c33e529dab473350372fd8e8e18d1322fe7aa8a
authorKoen Kooi <koen@openembedded.org>
Mon, 31 Oct 2005 21:23:02 +0000 (21:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Oct 2005 21:23:02 +0000 (21:23 +0000)
     and 63568fa256744014488cd1f4983565c78db1f166


Trivial merge