merge of 972552ee20c9c9c79e01afea5f9276b5e4c554bd
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 06:10:45 +0000 (06:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:10:45 +0000 (06:10 +0000)
commit2e73052fdbcb7b374e823cda25503a7a10dbc69d
treeda1ca1afc3a3138a34e6ad473908b04b737cda98
parent58d8ffa2cfd134d912985cb9fe41727b74461ab0
parentdbb098507e8c959424c32e299d8c91c0ae71332d
merge of 972552ee20c9c9c79e01afea5f9276b5e4c554bd
     and d17c8965045bca1d838e85c0b4579217b647682c