merge of '6989002d4c2b4ec91fce1dff1c9495f8f5227065'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 09:16:23 +0000 (09:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 09:16:23 +0000 (09:16 +0000)
     and '6ffad588794efffeaf5bd4b81f8aa3c7d3155dfa'


Trivial merge