merge of 9d518c785db1a806d81a8aacc799725428e542f4
authorJohn Bowler <jbowler@nslu2-linux.org>
Wed, 4 Jan 2006 01:24:34 +0000 (01:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Jan 2006 01:24:34 +0000 (01:24 +0000)
commit3856362ff9f118e1fa8308b847a4bc9a2f5850ea
tree266603e2a4b7fd5d30ee3a2fafdab0fb35142a03
parent00f830a1dc2c74a8052f85e3a42801d65cf1e9f2
parent71ec6042386c73f9cea0a817383c1b30b9f72b05
merge of 9d518c785db1a806d81a8aacc799725428e542f4
     and d5e1bc9b9d3db68b87987517770deb9a389f8333