merge of '60155ceff0e3c21add064d22518f08c6b3c5a304'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 16:44:04 +0000 (16:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 16:44:04 +0000 (16:44 +0000)
     and 'b0dc261f9674aecabb4a43c73a328aaba4ec338a'


Trivial merge