[SCM] dataset manipulation GUI generator branch, master, updated. upstream/1.2.3-26-ged200a3

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit ed200a3aeb4b50bd295c13afeef16ffb9d2b220d
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Nov 29 12:53:44 2010 -0500

    * fix the copyright for the guidata/userconfig.py file. (MIT licence)

diff --git a/debian/copyright b/debian/copyright
index 53f61f3..1e39acb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,6 +12,10 @@ Files: *
 Copyright: © 2010, CEA Commissariat à l'Energie Atomique
 Licence: CeCILLv2
 
+Files: guidata/userconfig.py
+Copyright: © 2009 Pierre Raybaut
+Licence: MIT
+
 License: CeCILLv2
  CeCILL FREE SOFTWARE LICENSE AGREEMENT
 
@@ -517,4 +521,31 @@ License: CeCILLv2
  jurisdiction, by the more diligent Party.
  
  
- Version 2.0 dated 2006-09-05.
\ No newline at end of file
+ Version 2.0 dated 2006-09-05.
+
+Licence: MIT
+ userconfig License Agreement (MIT License)
+ ------------------------------------------
+    
+ Copyright © 2009 Pierre Raybaut
+   
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.

-- 
dataset manipulation GUI generator