merge of '4f01b212b98a4b372493c483af8fda8300f38063'
authorKoen Kooi <koen@openembedded.org>
Thu, 20 Mar 2008 12:33:25 +0000 (12:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 20 Mar 2008 12:33:25 +0000 (12:33 +0000)
     and '776dc04c7eba19512692b4d40a123d45e6adb862'


Trivial merge