Another stupid sync with CVS to get the keywords right