merge of '288863eb61389cf9c42b3101a9e8cd27ebcd129a'
authorKoen Kooi <koen@openembedded.org>
Sun, 21 Oct 2007 15:18:45 +0000 (15:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 21 Oct 2007 15:18:45 +0000 (15:18 +0000)
     and 'f8424d0fef190f772371b3b3691233dbdd5e7b58'


Trivial merge