merge of '556711700dc782e2a3dae33b581a0f4b9d3bca2d'
authorKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:48 +0000 (09:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:48 +0000 (09:36 +0000)
     and '9cb28749b896afea4fb911d08a7bb6f26df50332'


Trivial merge