merge of '79ea02243e94fe9936f10935156fe8832b208e82'
authorKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 22:29:52 +0000 (22:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 22:29:52 +0000 (22:29 +0000)
     and '8bdc2454df92b6e1dd4a83179a268f6e4e9bb972'


Trivial merge