merge of '1071338fe9143d91f11215f627150ab1adc3a923'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Oct 2007 19:18:28 +0000 (19:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Oct 2007 19:18:28 +0000 (19:18 +0000)
     and '2cffc57d52392fbeabd7156350a781b1a803493e'


Trivial merge