0cda0e5 work on pulling up from 'master'

Merged and Committed by Nalin Dahyabhai 16 years ago
    work on pulling up from 'master'
    
    Merge branch 'master' into rxk5-devel-branch
    
    Conflicts:
    
    	ChangeLog
    	Makefile.am
    	NEWS
    
        
file modified
+3 -0
file modified
+1 -1
file modified
+6 -4
file modified
+6 -1
file modified
+6 -0