merge of '34f1a5cd503f1c1aef18d4468fb112306166c499'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 12:34:41 +0000 (12:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 12:34:41 +0000 (12:34 +0000)
     and 'd3b7dd0f986647b0949b0f10ae6b633653a05bde'


Trivial merge