merge of 'dad836385287178e12f53cd63adfb7b695a4c09f'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 21:16:36 +0000 (21:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 21:16:36 +0000 (21:16 +0000)
     and 'e9e449e083c624d15e55fc8135249c653031f4f1'


Trivial merge