merge of 87274db5332eba6f472a3332129b88b8282ccda2
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 6 Feb 2006 18:36:28 +0000 (18:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 18:36:28 +0000 (18:36 +0000)
commit5c70d86825ced73fe07d02a4647e70c54f2efe07
tree23b7b80934d3f7d54d036bfa71c7ffae68dd169b
parent11ec8ab68be596ed8fca854042f2e8815da19ce2
parentedab0569b271a6c11d611afcdeb3f8a5a3a682e6
merge of 87274db5332eba6f472a3332129b88b8282ccda2
     and 3b6a0bff32c9c79ebeb059cd1559d7731542af03