merge of 4648f865a842cefe397db73feeab9f094661b71c
authorHolger Freyther <zecke@selfish.org>
Wed, 14 Dec 2005 16:20:18 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Dec 2005 16:20:18 +0000 (16:20 +0000)
commit199603650e80eadf536e377dcef4b9ea6bc5651f
treec697ee7e10853f68c154bd77ffd42173ad089fa0
parent786189fd62530deece28b5b008933e7dea763538
parent1f4620eaaf780152832daa13140a957b27c2a664
merge of 4648f865a842cefe397db73feeab9f094661b71c
     and 95588e59115518a149f9b537e1682e031b795891