merge of '1d466223051b440fb06aab1ad59b32e9d6327361'
authorKoen Kooi <koen@openembedded.org>
Sun, 12 Aug 2007 10:04:39 +0000 (10:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 12 Aug 2007 10:04:39 +0000 (10:04 +0000)
     and 'fd98012fea1d4da46fcc95cf50ac457d7c7f1023'


Trivial merge