merge of 542f6b46587305352d62fe667186ce8ecb2b961f
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 2 Dec 2005 16:54:17 +0000 (16:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 16:54:17 +0000 (16:54 +0000)
commitd416cca1e8d5b1f1a3f1e82dd2d495f34582bd41
tree4cd17b8ea3659ea1ae37e6fc6fd9b100271fa734
parentd6d48213133a34b9cea46aec56ea3324e73a0039
parent1a1a3a00ee9b0be2e20b8e7d6153e7e74b4b6a21
merge of 542f6b46587305352d62fe667186ce8ecb2b961f
     and abdb3c1396c6a41a9593637725c84bf2db2acdb0