merge of '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
authorKoen Kooi <koen@openembedded.org>
Mon, 19 Nov 2007 15:17:39 +0000 (15:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 19 Nov 2007 15:17:39 +0000 (15:17 +0000)
     and '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'


Trivial merge