merge of '243cd3c062dedab306729396ebc2e44a5b81f1e9'
authorKoen Kooi <koen@openembedded.org>
Mon, 8 Jan 2007 16:48:26 +0000 (16:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 8 Jan 2007 16:48:26 +0000 (16:48 +0000)
     and '6483d4d1753ce1d08be64fec9c95489015da580f'


Trivial merge