merge of '4a44b08ef83a5075a82f85c34d592996acfcec95'
authorKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 09:04:44 +0000 (09:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 09:04:44 +0000 (09:04 +0000)
     and '525970acffe8506ad362922236614a52c8860952'


Trivial merge