merge of '5a26245df5a73c8d0bf8f987e469566f6955e6cf'
authorKoen Kooi <koen@openembedded.org>
Wed, 25 Oct 2006 19:44:38 +0000 (19:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 25 Oct 2006 19:44:38 +0000 (19:44 +0000)
     and 'a6b55df21b68c18274ec3a7e51a4a8fb1f75ea3f'


Trivial merge