merge of 'dea5fd7f1b27baf261b5d668733d4ab001554649'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 13:05:20 +0000 (13:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 13:05:20 +0000 (13:05 +0000)
     and 'e0f1f9bc5dd648488bd0c935a9b9ee33a518f15d'


Trivial merge