Moved CVS history to the end of file
Sync with CVS to pick up all expanded CVS keywords
Moved CVS history to the end of file
Fixed style with astyle -s3 -p -H -A3 -k3 -O -o -y -Y -f