clarify the role of CEA

AUTHORS

@@ -11,20 +11,20 @@ The principal developers of Kwant are
 
 The authors can be reached at authors@kwant-project.org.
 
-The contributions of Christoph and Xavier are part of their work at `CEA
-<http://cea.fr>`_, the French Commissariat à l'énergie atomique et aux énergies
-alternatives.
-
 Other people that have contributed to Kwant include
 
-* Daniel Jaschke
-* Joseph Weston
-
-(To find out who exactly wrote a certain part of Kwant, please use the "blame"
-feature of `Git <http://git-scm.com/>`_, the version control system.)
+* Daniel Jaschke (SPSMS-INAC-CEA Grenoble)
+* Joseph Weston (SPSMS-INAC-CEA Grenoble)
 
 We thank Christoph Gohlke for the creation of Windows installers.
 
+`CEA <http://cea.fr>`_ is the French Commissariat à l'énergie atomique et aux
+énergies alternatives.  The CEA is the copyright holder for the contributions of
+C. W. Groth, X. Waintal, and its other employees involved in Kwant.
+
+To find out who wrote a certain part of Kwant, please use the "blame" feature of
+`Git <http://git-scm.com/>`_, the version control system.
+
 
 Funding
 -------

LICENSE

@@ -6,8 +6,10 @@ Kwant license
 ``doc/sphinxext`` subdirectory for which ``doc/sphinxext/LICENSE.txt``
 applies.)
 
-Copyright 2011-2013 C. W. Groth, M. Wimmer, A. R. Akhmerov, X. Waintal, and
-others.  All rights reserved.
+Copyright 2011-2013 C. W. Groth (CEA), M. Wimmer, A. R. Akhmerov,
+X. Waintal (CEA), and others.  All rights reserved.
+
+(CEA = Commissariat à l'énergie atomique et aux énergies alternatives)
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

doc/source/conf.py

@@ -43,7 +43,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Kwant'
-copyright = u'2011-2013, C. W. Groth, M. Wimmer, A. R. Akhmerov, X. Waintal, and others'
+copyright = u'2011-2013, C. W. Groth (CEA), M. Wimmer, A. R. Akhmerov, X. Waintal (CEA), and others'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

setup.py

@@ -438,7 +438,7 @@ def ext_modules(extensions):
 def main():
     setup(name='kwant',
           version=version(),
-          author='C. W. Groth, M. Wimmer, A. R. Akhmerov, X. Waintal, and others',
+          author='C. W. Groth (CEA), M. Wimmer, A. R. Akhmerov, X. Waintal (CEA), and others',
           author_email='authors@kwant-project.org',
           description="Package for numerical quantum transport calculations.",
           long_description=long_description(),