merge from 0.7.9 at 0.7.9

1 files changed, 10 insertions, 20 deletions

diff --git a/setup.py b/setup.py
index 8ff667d5..04036078 100755
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,12 @@
-# vi: ts=4 expandtab
-#
-#    Distutils magic for ec2-init
-#
-#    Copyright (C) 2009 Canonical Ltd.
-#    Copyright (C) 2012 Yahoo! Inc.
-#
-#    Author: Soren Hansen <soren@canonical.com>
-#    Author: Joshua Harlow <harlowja@yahoo-inc.com>
+# Copyright (C) 2009 Canonical Ltd.
+# Copyright (C) 2012 Yahoo! Inc.
 #
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
+# Author: Soren Hansen <soren@canonical.com>
+# Author: Joshua Harlow <harlowja@yahoo-inc.com>
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of cloud-init.  See LICENSE file for license information.
+
+# Distutils magic for ec2-init
 
 from glob import glob
 
@@ -209,7 +197,7 @@ setuptools.setup(
     url='http://launchpad.net/cloud-init/',
     packages=setuptools.find_packages(exclude=['tests']),
     scripts=['tools/cloud-init-per'],
-    license='GPLv3',
+    license='Dual-licensed under GPLv3 or Apache 2.0',
     data_files=data_files,
     install_requires=requirements,
     cmdclass=cmdclass,
@@ -219,3 +207,5 @@ setuptools.setup(
         ],
     }
 )
+
+# vi: ts=4 expandtab