merge of 14beb6e3b60e8a96ea90e6228aed0ecce61cba68
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jul 2005 23:12:58 +0000 (23:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 23:12:58 +0000 (23:12 +0000)
     and 68aa0d882dcad7cf44d1b57c0264ab1ecd1ea9de


Trivial merge