merge of '8be7406d131a307bb409ca173b6b0bb55c092bc6'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:00 +0000 (09:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:00 +0000 (09:57 +0000)
     and 'd86d6413edacca9f55683204f6ec67098e2de319'


Trivial merge