merge of 0241a34ef686562063ef44062a77a85c9c8343ca
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 7 Jan 2006 17:33:34 +0000 (17:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 17:33:34 +0000 (17:33 +0000)
commit511684d214520a8bd7f9b95ca0ffce860009d6f2
tree8c75b99dc2589d555bb42331ecad183fb626fbe8
parent8a9a5b13be25fe84b67b7b21e706dfb28ca0647c
parent0af7b363541d2e31adaf8a3921c901cb199956c2
merge of 0241a34ef686562063ef44062a77a85c9c8343ca
     and 37e4e397cfd639a4c09ed7c5f8d5a23a81a966c7