Merge branch 'branch-6-0'

Conflicts:
	HISTORY.TXT

HISTORY.TXT

@@ -9,7 +9,7 @@ next.  Developers are strongly encouraged to document their changes and
 their impacts on the users here.  (Please add the most recent changes to 
 the top of the list.)
 
-For a complete change history, please see the Subversion log comments.
+For a complete change history, please see the Git log comments.
 
 Current Version (git master, 6.1-dev, future 6.2): 
 -------------------------------------------------