merge of '90351b745d224f3df5a0fd1defc219452b21a55b'
authorKoen Kooi <koen@openembedded.org>
Thu, 22 Mar 2007 07:57:36 +0000 (07:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 22 Mar 2007 07:57:36 +0000 (07:57 +0000)
     and 'd0c48feb35f1f108e69054172cfc68954b2cee1d'


Trivial merge