From: root <root@cassidy.cs.princeton.edu>
Date: Sun, 24 Oct 2010 20:12:42 +0000 (-0400)
Subject: Merge commit 'local_master/planetlab-3_3-bootcd-branch' into planetlab-3_2-branch
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=17312b0628d0dcf00214fd03d44d834a649c4f3d;hp=a3ad7270dc6982e83fa947f4f8cf1bd7272fe15b;p=nodeupdate.git

Merge commit 'local_master/planetlab-3_3-bootcd-branch' into planetlab-3_2-branch
---

diff --git a/NodeUpdate.spec b/NodeUpdate.spec
index 31a8a24..27e28da 100644
--- a/NodeUpdate.spec
+++ b/NodeUpdate.spec
@@ -12,7 +12,7 @@ Name: %{name}
 Version: %{version}
 Release: %{release}
 Requires: python2 >= 2.2, yum >= 2.0.3-3_planetlab
-Copyright: GPL
+License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}root