merge of '1828e091ae06fc2f6f869299de7c7187900c649c'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 14:08:17 +0000 (14:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 14:08:17 +0000 (14:08 +0000)
     and '54383b7d45cbdbb90ca3491e4a105edd944c66ec'


Trivial merge