Merge from stable branch.

2008-06-14 19:53:04 +00:00
parent 18ab306e63
commit e9d247d2b0
155 changed files with 15577 additions and 5441 deletions
--- a/2
+++ b/2
@@ -613,6 +613,8 @@ my $fips=0;

 my %disabled = ( # "what"         => "comment"
                 "camellia"       => "default",
+                 "capieng"        => "default",
+                 "cms"            => "default",
                 "gmp"            => "default",
                 "mdc2"           => "default",
                 "rc5"            => "default",