merge of d2b50db8c3a2dfa93a56f34063e7e78182ac274c
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 01:10:55 +0000 (01:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 01:10:55 +0000 (01:10 +0000)
commitbe954a5547b18eb5f78c22fa36000eab2daa3655
tree9bb6c9b235963c9b6b94fb54c8cf786273875da0
parentf3630ccede2047ba388d7b930f40c1c2d840cf4c
parent2f0e3d2a376647127e9d569aa9d2ab0ae2211843
merge of d2b50db8c3a2dfa93a56f34063e7e78182ac274c
     and ef11dd4e8067d9c4f020b6cd39b8556bab34dc7a