merge of '3a72c4b2962d909444aaaee9569be3bb90169577'
authorKoen Kooi <koen@openembedded.org>
Mon, 16 Oct 2006 13:58:07 +0000 (13:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 16 Oct 2006 13:58:07 +0000 (13:58 +0000)
     and '514b31d89c294ce11810ee76a2138d455216409b'


Trivial merge