Merge branch 'glendale' of git:/git/vyatta-cfg into glendale

1 files changed, 15 insertions, 11 deletions

diff --git a/src/cli_val_engine.h b/src/cli_val_engine.h
index 0f32276..6315dac 100644
--- a/src/cli_val_engine.h
+++ b/src/cli_val_engine.h
@@ -4,17 +4,21 @@
  Module: cli
  
  **** License ****
- Version: VPL 1.0
- 
- The contents of this file are subject to the Vyatta Public License
- Version 1.0 ("License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.vyatta.com/vpl
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ 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.
+
+ A copy of the GNU General Public License is available as
+ `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+ or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+ You can also obtain it by writing to the Free Software Foundation,
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
  
  This code was originally developed by Vyatta, Inc.
  Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.