merge of 'b01d1445a9bec64883dc3658a911ae78a7a3fdf3'
authorKoen Kooi <koen@openembedded.org>
Thu, 6 Dec 2007 18:18:01 +0000 (18:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 6 Dec 2007 18:18:01 +0000 (18:18 +0000)
     and 'e28b8a60e16c1ac1bc401bef085f99994a52d98b'


Trivial merge