Merged revisions 1559-1560,1573 via svnmerge from

https://babelfish.arc.nasa.gov/svn/visionworkbench/trunk

........
  r1559 | mbroxton | 2009-02-17 13:58:50 -0800 (Tue, 17 Feb 2009) | 1 line
  
  Fixed a number of minor compiler warnings.  Also cleaned up disparityMap.h
........
  r1560 | mbroxton | 2009-02-17 14:01:14 -0800 (Tue, 17 Feb 2009) | 1 line
  
  Fixed one more minor compiler warning.
........
  r1573 | anefian | 2009-02-18 00:13:24 -0800 (Wed, 18 Feb 2009) | 1 line
  
  added mixture weights
........