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)
commit13f5c7dc29dd345efc3f224acf5616c9ca598284
treea16f376b80a9803bc4d81c2824e9c1497439dbbb
parent066a8f972fc1f0807b3e54ba6cef07b136bd4cd8
parent1968e50feaf0f6df3550f378aa893a2bb73f891a
merge of 4741ce472626483ef14f4a9e8706f74f696beea4
     and 9864f624e216fb40fafd7e08d11393c5847d037c