merge of d98bddca253787a807b76b6be9423e6ba00c82d6
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Sep 2005 14:07:25 +0000 (14:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Sep 2005 14:07:25 +0000 (14:07 +0000)
     and e2a816aff604255054dab445c96dc779de75bc3d


Trivial merge