merge of 93e812fbc937162b0851de128abef31f54210e80
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 12:33:07 +0000 (12:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:33:07 +0000 (12:33 +0000)
     and f4894fdd3104bff5cf149a07d1c3bcaa29c31e15


Trivial merge