merge of '4bc8cc047648935876ee77c832ac802bb2411919'
authorKoen Kooi <koen@openembedded.org>
Thu, 3 May 2007 07:32:49 +0000 (07:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 3 May 2007 07:32:49 +0000 (07:32 +0000)
     and '813e5c48efd70de54894dd747857e21994a78024'


Trivial merge