merge of '2f5ddd4439353dd39a492ac747a3f655b361c234'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:17:14 +0000 (11:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:17:14 +0000 (11:17 +0000)
     and 'bef23ed01b940f3c5bf62b3bd5e591a33c509ef6'


Trivial merge