merge of '2de185389e4f5cf5e749eb1645efe691e9fad4f8'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:15 +0000 (09:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:15 +0000 (09:57 +0000)
     and 'e6fa426a909123cbd9d0a3fdf92a16a53c9722e9'


Trivial merge