merge of 53837b57b14a20c51df704090e14559b1bb45c2e
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 7 Feb 2006 02:45:14 +0000 (02:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 02:45:14 +0000 (02:45 +0000)
commit4fc48e94ff44f6bcd110ed16c53e0e2a589c689f
treef057657db966c453f3b42e10c9a59e71a89640d4
parent27651b95cc9880d646b60e62686bbd1b000556ba
parentaec9182e61d1ea2971d35ccb141339ea44fb63e5
merge of 53837b57b14a20c51df704090e14559b1bb45c2e
     and db44099923569a202d14953cbddea82c0547ccb1