merge of '6f74b1eb3fab7fe5291f29a3ca501a9512fc4ff3'
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 12:37:38 +0000 (12:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 12:37:38 +0000 (12:37 +0000)
     and '82fd07d559cea99227ba82e74e7ce9dc86abc33f'


Trivial merge