merge of 4741ce472626483ef14f4a9e8706f74f696beea4
authorKoen Kooi <koen@openembedded.org>
Thu, 3 Nov 2005 18:57:44 +0000 (18:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Nov 2005 18:57:44 +0000 (18:57 +0000)
     and 9864f624e216fb40fafd7e08d11393c5847d037c


Trivial merge