Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp

Conflicts:

	src/math/ChangeLog

diff --cc src/math/ChangeLog
index b3c9386d43d22dfc8f680641ee744b9cd02bb5c1,dc06ded80ad63e1248fdaf26051172380c97819c..78fbfbc17183109ccf7eb6d16b981844ce0a471e
--- 1/src/math/ChangeLog
--- 2/src/math/ChangeLog
+++ b/src/math/ChangeLog
@@@ -1,10 -1,17 +1,24 @@@
 +2008-07-24   John Darrington <john@darrington.wattle.id.au>
 +
 +      * merge.c merge.h sort.c sort.h: Removed the value_cnt associated
 +      with case ordering.  This ensures that the casereader returned by
 +      sort_execute now has the same dimensions as the casereader passed 
 +      in.
 +
+ 2008-07-24  Jason H Stover  <jhs@math.gcsu.edu>
+ 
+       * covariance-matrix.c (covariance_pass_two): Dropped weight
+       argument. Corrected update of the entries of the covariance
+       matrix. 
+ 
+       * covariance-matrix.c (column_iterate): Dropped weight
+       argument. Corrected update of the entries of the covariance
+       matrix. 
+ 
+       * covariance-matrix.c (covariance_update_categorical_numeric):
+       Dropped weight argument. Corrected update of the entries of the
+       covariance matrix.
+ 
  2008-07-17  Jason H Stover  <jhs@math.gcsu.edu>
  
        * covariance-matrix.c (covariance_update_categorical_numeric):