[gnome-control-center] re-license GPLv2-only code to GPLv2+ permission from SUSE/RH legal cf. https://bugzilla.gnome.org/sh

[Michael Meeks <michael src gnome org>]

commit 527945b29e25e9db8f9196df12ef914c6e24f852
Author: Michael Meeks <michael meeks suse com>
Date:   Mon Nov 12 15:56:39 2012 +0000

    re-license GPLv2-only code to GPLv2+ permission from SUSE/RH legal
    cf. https://bugzilla.gnome.org/show_bug.cgi?id=681834

 panels/background/cc-background-xml.c |   22 +++++++++++-----------
 panels/background/cc-background-xml.h |   24 ++++++++++++------------
 2 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/panels/background/cc-background-xml.c b/panels/background/cc-background-xml.c
index 69a5713..d31c91f 100644
--- a/panels/background/cc-background-xml.c
+++ b/panels/background/cc-background-xml.c
@@ -5,19 +5,19 @@
  *  Copyright 2003-2006 Novell, Inc. (www.novell.com)
  *  Copyright 2011 Red Hat Inc.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public License
- *  as published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include <gio/gio.h>
diff --git a/panels/background/cc-background-xml.h b/panels/background/cc-background-xml.h
index 697a877..b4700a1 100644
--- a/panels/background/cc-background-xml.h
+++ b/panels/background/cc-background-xml.h
@@ -1,21 +1,21 @@
 /*
  *  Authors: Rodney Dawes <dobey ximian com>
  *
- *  Copyright 2003-2006 Novell, Inc. (www.novell.com)
+ *  Copyright 2003-2012 Novell, Inc. (www.novell.com)
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public License
- *  as published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef _CC_BACKGROUND_XML_H_