merge of 'a2aae4f80718c14e9f674b807392f44f885c5b12'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 21:47:46 +0000 (21:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 21:47:46 +0000 (21:47 +0000)
     and 'db14262a47dcb743532984359aa1cc6972d10007'


Trivial merge