merge of 31e4b6a6f2954655d18e0e65341dbd7053995cec
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 23 Sep 2005 00:36:12 +0000 (00:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Sep 2005 00:36:12 +0000 (00:36 +0000)
commit883b71600a2b3b456c73c644c8d5f3bba21e0d01
tree7790ec6341f914db8d2ca8b2f8590bc0fbfe6446
parent1511edfb4338f3cb2e1082c00ee91a6d040453e3
parente924e46e937f34481ac2f3e09d76e0b726b2cbd8
merge of 31e4b6a6f2954655d18e0e65341dbd7053995cec
     and 68ad04146d2caa3296187babd7b1ea4128dac5f1