merge of 8ae00e8423679ec41790b01db397b47b07473927
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 21 Jan 2006 00:22:57 +0000 (00:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 00:22:57 +0000 (00:22 +0000)
commit3fc4e7483657130b7c4fbc596bcfe0572d60b877
treea3e35d41611dbfa41b58c05a90b938132c8d0a7a
parent0c751c19a7e2899fb7e5ef19a05fda53b91fb899
parent72a69325e8f9989ad0efc7b42f232e2f7baa6e6b
merge of 8ae00e8423679ec41790b01db397b47b07473927
     and 90cfec2b058d549c4919f09e6d58e09c7dabca84