Index: contrib/client-side/svnmerge.py
===================================================================
--- contrib/client-side/svnmerge.py	(revision 19109)
+++ contrib/client-side/svnmerge.py	(working copy)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (c) 2005, Giovanni Bajo
-# Copyright (c) 2004-2005, Awarix, Inc.
+# Copyright (c) 2005 Giovanni Bajo.
+# Copyright (c) 2004,2005 Awarix, Inc.
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
@@ -1545,8 +1545,8 @@
 
     optsparser = CommandOpts(global_opts, common_opts, command_table,
                              version="%%prog r%s\n  modified: %s\n\n"
-                                     "Copyright (C) 2004,2005 Awarix Inc.\n"
-                                     "Copyright (C) 2005, Giovanni Bajo"
+                                     "Copyright (c) 2004,2005 Awarix Inc.\n"
+                                     "Copyright (c) 2005 Giovanni Bajo."
                                      % (__revision__, __date__))
 
     cmd, args, state = optsparser.parse(args)