diff --git a/library/Zend/Acl/Acl.php b/library/Zend/Acl/Acl.php
index 06d57ee1a44..0d077898767 100644
--- a/library/Zend/Acl/Acl.php
+++ b/library/Zend/Acl/Acl.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Acl
 {
diff --git a/library/Zend/Acl/Assertion/AssertionInterface.php b/library/Zend/Acl/Assertion/AssertionInterface.php
index cd5a77fd17a..bbd3578f38e 100644
--- a/library/Zend/Acl/Assertion/AssertionInterface.php
+++ b/library/Zend/Acl/Assertion/AssertionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl\Assertion;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AssertionInterface
 {
diff --git a/library/Zend/Acl/Exception/ExceptionInterface.php b/library/Zend/Acl/Exception/ExceptionInterface.php
index 6c2f1a5afbd..097ec4f55c7 100644
--- a/library/Zend/Acl/Exception/ExceptionInterface.php
+++ b/library/Zend/Acl/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Acl/Resource/GenericResource.php b/library/Zend/Acl/Resource/GenericResource.php
index 0713561113d..9a67e58ad70 100644
--- a/library/Zend/Acl/Resource/GenericResource.php
+++ b/library/Zend/Acl/Resource/GenericResource.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl\Resource;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericResource implements ResourceInterface
 {
diff --git a/library/Zend/Acl/Resource/ResourceInterface.php b/library/Zend/Acl/Resource/ResourceInterface.php
index 5e43fc1f417..e3557e658df 100644
--- a/library/Zend/Acl/Resource/ResourceInterface.php
+++ b/library/Zend/Acl/Resource/ResourceInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl\Resource;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ResourceInterface
 {
diff --git a/library/Zend/Acl/Role/GenericRole.php b/library/Zend/Acl/Role/GenericRole.php
index c61bf6b2f84..808899a07d2 100644
--- a/library/Zend/Acl/Role/GenericRole.php
+++ b/library/Zend/Acl/Role/GenericRole.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl\Role;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericRole implements RoleInterface
 {
diff --git a/library/Zend/Acl/Role/Registry.php b/library/Zend/Acl/Role/Registry.php
index a9b55136e06..f97ecedaff9 100644
--- a/library/Zend/Acl/Role/Registry.php
+++ b/library/Zend/Acl/Role/Registry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl\Role;
@@ -28,8 +26,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Registry
 {
diff --git a/library/Zend/Acl/Role/RoleInterface.php b/library/Zend/Acl/Role/RoleInterface.php
index 917e2128338..1c95517f21b 100644
--- a/library/Zend/Acl/Role/RoleInterface.php
+++ b/library/Zend/Acl/Role/RoleInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Acl\Role;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RoleInterface
 {
diff --git a/library/Zend/Amf/AbstractAuthentication.php b/library/Zend/Amf/AbstractAuthentication.php
index 2ee345564aa..cafb93a6030 100644
--- a/library/Zend/Amf/AbstractAuthentication.php
+++ b/library/Zend/Amf/AbstractAuthentication.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf;
@@ -25,8 +23,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Auth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAuthentication implements \Zend\Authentication\Adapter\AdapterInterface
 {
diff --git a/library/Zend/Amf/Adobe/Authentication.php b/library/Zend/Amf/Adobe/Authentication.php
index d36dbab31e5..0962dca8db7 100644
--- a/library/Zend/Amf/Adobe/Authentication.php
+++ b/library/Zend/Amf/Adobe/Authentication.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Adobe;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Authentication extends AbstractAuthentication
 {
diff --git a/library/Zend/Amf/Adobe/DbInspector.php b/library/Zend/Amf/Adobe/DbInspector.php
index 33e91733196..a5dbedf621b 100644
--- a/library/Zend/Amf/Adobe/DbInspector.php
+++ b/library/Zend/Amf/Adobe/DbInspector.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Adobe;
@@ -25,8 +23,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbInspector
 {
diff --git a/library/Zend/Amf/Adobe/Introspector.php b/library/Zend/Amf/Adobe/Introspector.php
index 76bdffbf265..1f0d687e063 100644
--- a/library/Zend/Amf/Adobe/Introspector.php
+++ b/library/Zend/Amf/Adobe/Introspector.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Adobe;
@@ -34,8 +32,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Introspector
 {
diff --git a/library/Zend/Amf/Constants.php b/library/Zend/Amf/Constants.php
index 29ea3e20883..525a4b2102d 100644
--- a/library/Zend/Amf/Constants.php
+++ b/library/Zend/Amf/Constants.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf;
@@ -25,8 +23,6 @@
  * deserialization to detect the AMF marker and encoding types.
  *
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class Constants
 {
diff --git a/library/Zend/Amf/Exception/BadMethodCallException.php b/library/Zend/Amf/Exception/BadMethodCallException.php
index 3b412e9638d..12caa2f5342 100644
--- a/library/Zend/Amf/Exception/BadMethodCallException.php
+++ b/library/Zend/Amf/Exception/BadMethodCallException.php
@@ -6,4 +6,4 @@ class BadMethodCallException
     extends \BadMethodCallException
     implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Amf/Exception/ExceptionInterface.php b/library/Zend/Amf/Exception/ExceptionInterface.php
index cf20c7e029d..1a0253dac4f 100644
--- a/library/Zend/Amf/Exception/ExceptionInterface.php
+++ b/library/Zend/Amf/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Exception;
@@ -23,9 +21,7 @@
 /**
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Amf/Exception/InvalidArgumentException.php b/library/Zend/Amf/Exception/InvalidArgumentException.php
index f9aef9ef34b..902936c3f6f 100644
--- a/library/Zend/Amf/Exception/InvalidArgumentException.php
+++ b/library/Zend/Amf/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Exception/LengthException.php b/library/Zend/Amf/Exception/LengthException.php
index 9691c92f931..3df0b0d0898 100644
--- a/library/Zend/Amf/Exception/LengthException.php
+++ b/library/Zend/Amf/Exception/LengthException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LengthException extends \LengthException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Exception/OutOfBoundsException.php b/library/Zend/Amf/Exception/OutOfBoundsException.php
index e417b861531..de8a6c1adbf 100644
--- a/library/Zend/Amf/Exception/OutOfBoundsException.php
+++ b/library/Zend/Amf/Exception/OutOfBoundsException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Exception/RuntimeException.php b/library/Zend/Amf/Exception/RuntimeException.php
index 2d5213256ea..801b653a849 100644
--- a/library/Zend/Amf/Exception/RuntimeException.php
+++ b/library/Zend/Amf/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage UnitTest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Exception/UnderflowException.php b/library/Zend/Amf/Exception/UnderflowException.php
index 19c16319adf..9824199d4d5 100644
--- a/library/Zend/Amf/Exception/UnderflowException.php
+++ b/library/Zend/Amf/Exception/UnderflowException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnderflowException extends \UnderflowException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Parser/AbstractDeserializer.php b/library/Zend/Amf/Parser/AbstractDeserializer.php
index 8933082f212..3f74ac8658b 100644
--- a/library/Zend/Amf/Parser/AbstractDeserializer.php
+++ b/library/Zend/Amf/Parser/AbstractDeserializer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -31,8 +29,6 @@
  * @see        http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractDeserializer implements DeserializerInterface
 {
diff --git a/library/Zend/Amf/Parser/AbstractSerializer.php b/library/Zend/Amf/Parser/AbstractSerializer.php
index 1d5ce288f06..d1c312f2f8b 100644
--- a/library/Zend/Amf/Parser/AbstractSerializer.php
+++ b/library/Zend/Amf/Parser/AbstractSerializer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractSerializer implements SerializerInterface
 {
diff --git a/library/Zend/Amf/Parser/Amf0/Deserializer.php b/library/Zend/Amf/Parser/Amf0/Deserializer.php
index 3a43035ff0c..06c651f2a90 100644
--- a/library/Zend/Amf/Parser/Amf0/Deserializer.php
+++ b/library/Zend/Amf/Parser/Amf0/Deserializer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Amf0;
@@ -33,8 +31,6 @@
  * @todo       Class could be implmented as Factory Class with each data type it's own class
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Deserializer extends AbstractDeserializer
 {
diff --git a/library/Zend/Amf/Parser/Amf0/Serializer.php b/library/Zend/Amf/Parser/Amf0/Serializer.php
index 92e200333c8..b59670d519b 100644
--- a/library/Zend/Amf/Parser/Amf0/Serializer.php
+++ b/library/Zend/Amf/Parser/Amf0/Serializer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Amf0;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Serializer extends AbstractSerializer
 {
diff --git a/library/Zend/Amf/Parser/Amf3/Deserializer.php b/library/Zend/Amf/Parser/Amf3/Deserializer.php
index b72e2244bb7..68dc229220a 100644
--- a/library/Zend/Amf/Parser/Amf3/Deserializer.php
+++ b/library/Zend/Amf/Parser/Amf3/Deserializer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Amf3;
@@ -34,8 +32,6 @@
  * @todo       Class could be implemented as Factory Class with each data type it's own class.
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Deserializer extends AbstractDeserializer
 {
diff --git a/library/Zend/Amf/Parser/Amf3/Serializer.php b/library/Zend/Amf/Parser/Amf3/Serializer.php
index d41e99d69fd..fdbaa158e7e 100644
--- a/library/Zend/Amf/Parser/Amf3/Serializer.php
+++ b/library/Zend/Amf/Parser/Amf3/Serializer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Amf3;
@@ -34,8 +32,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Serializer extends AbstractSerializer
 {
diff --git a/library/Zend/Amf/Parser/DeserializerInterface.php b/library/Zend/Amf/Parser/DeserializerInterface.php
index 5ac3ac2b4b1..11c9b2b92da 100644
--- a/library/Zend/Amf/Parser/DeserializerInterface.php
+++ b/library/Zend/Amf/Parser/DeserializerInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -27,8 +25,6 @@
  * @see        http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface DeserializerInterface
 {
diff --git a/library/Zend/Amf/Parser/Exception/ExceptionInterface.php b/library/Zend/Amf/Parser/Exception/ExceptionInterface.php
index aecee286c5a..10905a9b951 100644
--- a/library/Zend/Amf/Parser/Exception/ExceptionInterface.php
+++ b/library/Zend/Amf/Parser/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/Amf/Parser/Exception/InvalidArgumentException.php b/library/Zend/Amf/Parser/Exception/InvalidArgumentException.php
index 95adc23811f..bd625e50eb1 100644
--- a/library/Zend/Amf/Parser/Exception/InvalidArgumentException.php
+++ b/library/Zend/Amf/Parser/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Parser/Exception/OutOfBoundsException.php b/library/Zend/Amf/Parser/Exception/OutOfBoundsException.php
index 7e1c90a5477..c7cf20f2aae 100644
--- a/library/Zend/Amf/Parser/Exception/OutOfBoundsException.php
+++ b/library/Zend/Amf/Parser/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Amv
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends Exception\OutOfBoundsException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Parser/Exception/RuntimeException.php b/library/Zend/Amf/Parser/Exception/RuntimeException.php
index 814eee16645..7a58fbe8262 100644
--- a/library/Zend/Amf/Parser/Exception/RuntimeException.php
+++ b/library/Zend/Amf/Parser/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Amv
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Amf/Parser/InputStream.php b/library/Zend/Amf/Parser/InputStream.php
index 3f50fc6b68d..7b10f5eb799 100644
--- a/library/Zend/Amf/Parser/InputStream.php
+++ b/library/Zend/Amf/Parser/InputStream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InputStream extends \Zend\Amf\Util\BinaryStream
 {
diff --git a/library/Zend/Amf/Parser/OutputStream.php b/library/Zend/Amf/Parser/OutputStream.php
index 0847ea94c50..5d5d305aa34 100644
--- a/library/Zend/Amf/Parser/OutputStream.php
+++ b/library/Zend/Amf/Parser/OutputStream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutputStream extends \Zend\Amf\Util\BinaryStream
 {
diff --git a/library/Zend/Amf/Parser/ParserBroker.php b/library/Zend/Amf/Parser/ParserBroker.php
index c63b2d7d590..31042612a9d 100644
--- a/library/Zend/Amf/Parser/ParserBroker.php
+++ b/library/Zend/Amf/Parser/ParserBroker.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParserBroker extends PluginBroker
 {
diff --git a/library/Zend/Amf/Parser/ParserLoader.php b/library/Zend/Amf/Parser/ParserLoader.php
index 1d6db9be7de..755902d2711 100644
--- a/library/Zend/Amf/Parser/ParserLoader.php
+++ b/library/Zend/Amf/Parser/ParserLoader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParserLoader extends PluginClassLoader
 {
diff --git a/library/Zend/Amf/Parser/Resource/MysqlResult.php b/library/Zend/Amf/Parser/Resource/MysqlResult.php
index ae1ec95f120..ab8ab3b9ed8 100644
--- a/library/Zend/Amf/Parser/Resource/MysqlResult.php
+++ b/library/Zend/Amf/Parser/Resource/MysqlResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Resource;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MysqlResult
 {
diff --git a/library/Zend/Amf/Parser/Resource/MysqliResult.php b/library/Zend/Amf/Parser/Resource/MysqliResult.php
index 9c4e50fbcbd..2b6fb4fe73b 100644
--- a/library/Zend/Amf/Parser/Resource/MysqliResult.php
+++ b/library/Zend/Amf/Parser/Resource/MysqliResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Resource;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MysqliResult
 {
diff --git a/library/Zend/Amf/Parser/Resource/Stream.php b/library/Zend/Amf/Parser/Resource/Stream.php
index ae09e28df7e..0194c89bb8c 100644
--- a/library/Zend/Amf/Parser/Resource/Stream.php
+++ b/library/Zend/Amf/Parser/Resource/Stream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser\Resource;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Stream
 {
diff --git a/library/Zend/Amf/Parser/SerializerInterface.php b/library/Zend/Amf/Parser/SerializerInterface.php
index 2b8438cb743..f6fc44cab45 100644
--- a/library/Zend/Amf/Parser/SerializerInterface.php
+++ b/library/Zend/Amf/Parser/SerializerInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface SerializerInterface
 {
diff --git a/library/Zend/Amf/Parser/TypeLoader.php b/library/Zend/Amf/Parser/TypeLoader.php
index 361e054da1d..467ff65617b 100644
--- a/library/Zend/Amf/Parser/TypeLoader.php
+++ b/library/Zend/Amf/Parser/TypeLoader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Parser;
@@ -29,8 +27,6 @@
  * @todo       PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace
  * @package    Zend_Amf
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class TypeLoader
 {
diff --git a/library/Zend/Amf/Request/HttpRequest.php b/library/Zend/Amf/Request/HttpRequest.php
index 1fa76cf799b..0d6b4c85d06 100644
--- a/library/Zend/Amf/Request/HttpRequest.php
+++ b/library/Zend/Amf/Request/HttpRequest.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Request
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Request;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Request
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpRequest extends StreamRequest
 {
diff --git a/library/Zend/Amf/Request/RequestInterface.php b/library/Zend/Amf/Request/RequestInterface.php
index 6f759d39437..958349e3b30 100644
--- a/library/Zend/Amf/Request/RequestInterface.php
+++ b/library/Zend/Amf/Request/RequestInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Request;
@@ -29,8 +27,6 @@
  *
  * @todo       Currently not checking if the object needs to be Type Mapped to a server object.
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RequestInterface
 {
diff --git a/library/Zend/Amf/Request/StreamRequest.php b/library/Zend/Amf/Request/StreamRequest.php
index fcb6d09a639..a5bdc111ac7 100644
--- a/library/Zend/Amf/Request/StreamRequest.php
+++ b/library/Zend/Amf/Request/StreamRequest.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Request;
@@ -30,8 +28,6 @@
  *
  * @todo       Currently not checking if the object needs to be Type Mapped to a server object.
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StreamRequest implements RequestInterface
 {
diff --git a/library/Zend/Amf/Response/HttpResponse.php b/library/Zend/Amf/Response/HttpResponse.php
index 0d7b841ad95..b7225ad1173 100644
--- a/library/Zend/Amf/Response/HttpResponse.php
+++ b/library/Zend/Amf/Response/HttpResponse.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Response;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpResponse extends StreamResponse
 {
diff --git a/library/Zend/Amf/Response/ResponseInterface.php b/library/Zend/Amf/Response/ResponseInterface.php
index cdbcb9aaee2..9561d102120 100644
--- a/library/Zend/Amf/Response/ResponseInterface.php
+++ b/library/Zend/Amf/Response/ResponseInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Response;
@@ -27,8 +25,6 @@
  * Handles converting the PHP object ready for response back into AMF
  *
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ResponseInterface
 {
diff --git a/library/Zend/Amf/Response/StreamResponse.php b/library/Zend/Amf/Response/StreamResponse.php
index c8ecdee157e..5e6c882bf37 100644
--- a/library/Zend/Amf/Response/StreamResponse.php
+++ b/library/Zend/Amf/Response/StreamResponse.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Response;
@@ -28,8 +26,6 @@
  * Handles converting the PHP object ready for response back into AMF
  *
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StreamResponse implements ResponseInterface
 {
diff --git a/library/Zend/Amf/Server.php b/library/Zend/Amf/Server.php
index cdd3973c7a1..68ce24864da 100644
--- a/library/Zend/Amf/Server.php
+++ b/library/Zend/Amf/Server.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf;
@@ -34,8 +32,6 @@
  * @todo       Make the relection methods cache and autoload.
  * @package    Zend_Amf
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Server implements ServerDefinition
 {
diff --git a/library/Zend/Amf/Util/BinaryStream.php b/library/Zend/Amf/Util/BinaryStream.php
index 01d6bafe033..b7ca2c0d0d9 100644
--- a/library/Zend/Amf/Util/BinaryStream.php
+++ b/library/Zend/Amf/Util/BinaryStream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Util
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Util;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Util
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BinaryStream
 {
diff --git a/library/Zend/Amf/Value/ByteArray.php b/library/Zend/Amf/Value/ByteArray.php
index 6b17378c5c4..a3298a73936 100644
--- a/library/Zend/Amf/Value/ByteArray.php
+++ b/library/Zend/Amf/Value/ByteArray.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ByteArray
 {
diff --git a/library/Zend/Amf/Value/MessageBody.php b/library/Zend/Amf/Value/MessageBody.php
index f28989f2189..6946551cad7 100644
--- a/library/Zend/Amf/Value/MessageBody.php
+++ b/library/Zend/Amf/Value/MessageBody.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value;
@@ -34,8 +32,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MessageBody
 {
diff --git a/library/Zend/Amf/Value/MessageHeader.php b/library/Zend/Amf/Value/MessageHeader.php
index c1c30a9f154..1cc0e705fb0 100644
--- a/library/Zend/Amf/Value/MessageHeader.php
+++ b/library/Zend/Amf/Value/MessageHeader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MessageHeader
 {
diff --git a/library/Zend/Amf/Value/Messaging/AbstractMessage.php b/library/Zend/Amf/Value/Messaging/AbstractMessage.php
index bac2db56677..4740b273045 100644
--- a/library/Zend/Amf/Value/Messaging/AbstractMessage.php
+++ b/library/Zend/Amf/Value/Messaging/AbstractMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value\Messaging;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AbstractMessage
 {
diff --git a/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
index 03b68298b18..3331fe9b2b5 100644
--- a/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
+++ b/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value\Messaging;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AcknowledgeMessage extends AsyncMessage
 {
diff --git a/library/Zend/Amf/Value/Messaging/ArrayCollection.php b/library/Zend/Amf/Value/Messaging/ArrayCollection.php
index 2fbe242563e..ca89d2db2e9 100644
--- a/library/Zend/Amf/Value/Messaging/ArrayCollection.php
+++ b/library/Zend/Amf/Value/Messaging/ArrayCollection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value\Messaging;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayCollection
 {
diff --git a/library/Zend/Amf/Value/Messaging/AsyncMessage.php b/library/Zend/Amf/Value/Messaging/AsyncMessage.php
index 39b61f6eb45..3312df35bf9 100644
--- a/library/Zend/Amf/Value/Messaging/AsyncMessage.php
+++ b/library/Zend/Amf/Value/Messaging/AsyncMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value\Messaging;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AsyncMessage extends AbstractMessage
 {
diff --git a/library/Zend/Amf/Value/Messaging/CommandMessage.php b/library/Zend/Amf/Value/Messaging/CommandMessage.php
index b22d46aee6b..9f6a251dfaf 100644
--- a/library/Zend/Amf/Value/Messaging/CommandMessage.php
+++ b/library/Zend/Amf/Value/Messaging/CommandMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value\Messaging;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CommandMessage extends AsyncMessage
 {
diff --git a/library/Zend/Amf/Value/Messaging/ErrorMessage.php b/library/Zend/Amf/Value/Messaging/ErrorMessage.php
index 45bb147d4cd..25428e0859c 100644
--- a/library/Zend/Amf/Value/Messaging/ErrorMessage.php
+++ b/library/Zend/Amf/Value/Messaging/ErrorMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value\Messaging;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorMessage extends AcknowledgeMessage
 {
diff --git a/library/Zend/Amf/Value/Messaging/RemotingMessage.php b/library/Zend/Amf/Value/Messaging/RemotingMessage.php
index f1baec31508..65c947af55a 100644
--- a/library/Zend/Amf/Value/Messaging/RemotingMessage.php
+++ b/library/Zend/Amf/Value/Messaging/RemotingMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value\Messaging;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RemotingMessage extends AbstractMessage
 {
diff --git a/library/Zend/Amf/Value/TraitsInfo.php b/library/Zend/Amf/Value/TraitsInfo.php
index 8a588f3067d..7f51edbcca5 100644
--- a/library/Zend/Amf/Value/TraitsInfo.php
+++ b/library/Zend/Amf/Value/TraitsInfo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Amf\Value;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TraitsInfo
 {
diff --git a/library/Zend/Authentication/Adapter/AdapterInterface.php b/library/Zend/Authentication/Adapter/AdapterInterface.php
index d5584d5bf66..bcfe05c348a 100644
--- a/library/Zend/Authentication/Adapter/AdapterInterface.php
+++ b/library/Zend/Authentication/Adapter/AdapterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/Authentication/Adapter/DbTable.php b/library/Zend/Authentication/Adapter/DbTable.php
index fb3d6f7822a..bbfb722a154 100644
--- a/library/Zend/Authentication/Adapter/DbTable.php
+++ b/library/Zend/Authentication/Adapter/DbTable.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbTable implements AdapterInterface
 {
diff --git a/library/Zend/Authentication/Adapter/Digest.php b/library/Zend/Authentication/Adapter/Digest.php
index ff2c4038a13..fb5feff6a8e 100644
--- a/library/Zend/Authentication/Adapter/Digest.php
+++ b/library/Zend/Authentication/Adapter/Digest.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Digest implements AdapterInterface
 {
diff --git a/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php b/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
index 513ecbc8f23..f1e24af7a80 100644
--- a/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Authentication/Adapter/Exception/RuntimeException.php b/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
index 098da273ab5..45e1809b255 100644
--- a/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php b/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
index aaa401e1af2..49ceec153c3 100644
--- a/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends Exception\UnexpectedValueException implements 
     ExceptionInterface
diff --git a/library/Zend/Authentication/Adapter/Http.php b/library/Zend/Authentication/Adapter/Http.php
index c76062c3d3b..a10db6aee36 100644
--- a/library/Zend/Authentication/Adapter/Http.php
+++ b/library/Zend/Authentication/Adapter/Http.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_HTTP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @todo       Support auth-int
  * @todo       Track nonces, nonce-count, opaque for replay protection and stale support
  * @todo       Support Authentication-Info header
diff --git a/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php b/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
index 2998aadfce6..79d3965abc3 100644
--- a/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
+++ b/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_HTTP_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Http\Exception;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php b/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
index 41f0fe0463c..e53d5ed5f0e 100644
--- a/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
+++ b/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Http\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php b/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
index 19c6bb3fa94..111598c6fcd 100644
--- a/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
+++ b/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Http\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Authentication/Adapter/Http/FileResolver.php b/library/Zend/Authentication/Adapter/Http/FileResolver.php
index 9e5021e726a..2ec31ec8d7b 100644
--- a/library/Zend/Authentication/Adapter/Http/FileResolver.php
+++ b/library/Zend/Authentication/Adapter/Http/FileResolver.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Http;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FileResolver implements ResolverInterface
 {
diff --git a/library/Zend/Authentication/Adapter/Http/ResolverInterface.php b/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
index 6bebf678729..bfb842f1fb9 100644
--- a/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
+++ b/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter\Http;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ResolverInterface
 {
diff --git a/library/Zend/Authentication/Adapter/InfoCard.php b/library/Zend/Authentication/Adapter/InfoCard.php
index 6ae99cea2f4..4b43a6b2918 100644
--- a/library/Zend/Authentication/Adapter/InfoCard.php
+++ b/library/Zend/Authentication/Adapter/InfoCard.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InfoCard implements AdapterInterface
 {
diff --git a/library/Zend/Authentication/Adapter/Ldap.php b/library/Zend/Authentication/Adapter/Ldap.php
index e248c6f932e..7ce6062b10c 100644
--- a/library/Zend/Authentication/Adapter/Ldap.php
+++ b/library/Zend/Authentication/Adapter/Ldap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ldap implements AdapterInterface
 {
diff --git a/library/Zend/Authentication/AuthenticationService.php b/library/Zend/Authentication/AuthenticationService.php
index 26b90955d8b..d0f41213982 100644
--- a/library/Zend/Authentication/AuthenticationService.php
+++ b/library/Zend/Authentication/AuthenticationService.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AuthenticationService
 {
diff --git a/library/Zend/Authentication/Exception/ExceptionInterface.php b/library/Zend/Authentication/Exception/ExceptionInterface.php
index 08fc60ee37d..18cf441fbdf 100644
--- a/library/Zend/Authentication/Exception/ExceptionInterface.php
+++ b/library/Zend/Authentication/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Authentication/Exception/InvalidArgumentException.php b/library/Zend/Authentication/Exception/InvalidArgumentException.php
index cc478517d13..8dd9c304b80 100644
--- a/library/Zend/Authentication/Exception/InvalidArgumentException.php
+++ b/library/Zend/Authentication/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Authentication/Exception/RuntimeException.php b/library/Zend/Authentication/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 8a787d2b3bf..6a962b6e5ae
--- a/library/Zend/Authentication/Exception/RuntimeException.php
+++ b/library/Zend/Authentication/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements
     ExceptionInterface
diff --git a/library/Zend/Authentication/Exception/UnexpectedValueException.php b/library/Zend/Authentication/Exception/UnexpectedValueException.php
index abb25f96733..9ee86c8147e 100644
--- a/library/Zend/Authentication/Exception/UnexpectedValueException.php
+++ b/library/Zend/Authentication/Exception/UnexpectedValueException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends \UnexpectedValueException implements 
     ExceptionInterface
diff --git a/library/Zend/Authentication/Result.php b/library/Zend/Authentication/Result.php
index 9d4a5f24812..fac79fb5922 100644
--- a/library/Zend/Authentication/Result.php
+++ b/library/Zend/Authentication/Result.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Result
 {
diff --git a/library/Zend/Authentication/Storage/NonPersistent.php b/library/Zend/Authentication/Storage/NonPersistent.php
index 4eada8f5d14..564704b3bee 100644
--- a/library/Zend/Authentication/Storage/NonPersistent.php
+++ b/library/Zend/Authentication/Storage/NonPersistent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Storage;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NonPersistent implements StorageInterface
 {
diff --git a/library/Zend/Authentication/Storage/Session.php b/library/Zend/Authentication/Storage/Session.php
index 83997754f4a..fa6767ba160 100644
--- a/library/Zend/Authentication/Storage/Session.php
+++ b/library/Zend/Authentication/Storage/Session.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Storage;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Session implements StorageInterface
 {
diff --git a/library/Zend/Authentication/Storage/StorageInterface.php b/library/Zend/Authentication/Storage/StorageInterface.php
index 425e34f6e34..357ef1ed3a7 100644
--- a/library/Zend/Authentication/Storage/StorageInterface.php
+++ b/library/Zend/Authentication/Storage/StorageInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Authentication\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StorageInterface
 {
diff --git a/library/Zend/Barcode/Barcode.php b/library/Zend/Barcode/Barcode.php
index b6883bd8a03..379a42e217e 100644
--- a/library/Zend/Barcode/Barcode.php
+++ b/library/Zend/Barcode/Barcode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Barcode
 {
diff --git a/library/Zend/Barcode/Exception/ExceptionInterface.php b/library/Zend/Barcode/Exception/ExceptionInterface.php
index 00704ffd71e..cc81f2f7c38 100644
--- a/library/Zend/Barcode/Exception/ExceptionInterface.php
+++ b/library/Zend/Barcode/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Exception;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Barcode/Exception/InvalidArgumentException.php b/library/Zend/Barcode/Exception/InvalidArgumentException.php
index 07a22e007cd..4f35e699c15 100644
--- a/library/Zend/Barcode/Exception/InvalidArgumentException.php
+++ b/library/Zend/Barcode/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Barcode/Exception/OutOfRangeException.php b/library/Zend/Barcode/Exception/OutOfRangeException.php
index b0dcf4d84bc..fe8b1aa2a25 100644
--- a/library/Zend/Barcode/Exception/OutOfRangeException.php
+++ b/library/Zend/Barcode/Exception/OutOfRangeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
 {
diff --git a/library/Zend/Barcode/Exception/RendererCreationException.php b/library/Zend/Barcode/Exception/RendererCreationException.php
index 9bcb0d1f090..0ec3b93464a 100644
--- a/library/Zend/Barcode/Exception/RendererCreationException.php
+++ b/library/Zend/Barcode/Exception/RendererCreationException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RendererCreationException
     extends \InvalidArgumentException
diff --git a/library/Zend/Barcode/Exception/RuntimeException.php b/library/Zend/Barcode/Exception/RuntimeException.php
index 16469baed42..11bfeea6d9b 100644
--- a/library/Zend/Barcode/Exception/RuntimeException.php
+++ b/library/Zend/Barcode/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Barcode/Exception/UnexpectedValueException.php b/library/Zend/Barcode/Exception/UnexpectedValueException.php
index fdfbaf6b0f6..9abb740243b 100644
--- a/library/Zend/Barcode/Exception/UnexpectedValueException.php
+++ b/library/Zend/Barcode/Exception/UnexpectedValueException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends \UnexpectedValueException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Object/AbstractObject.php b/library/Zend/Barcode/Object/AbstractObject.php
index d3c368793a7..613dcec9b30 100644
--- a/library/Zend/Barcode/Object/AbstractObject.php
+++ b/library/Zend/Barcode/Object/AbstractObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractObject implements ObjectInterface
 {
diff --git a/library/Zend/Barcode/Object/Codabar.php b/library/Zend/Barcode/Object/Codabar.php
index b6ceb9a4587..7785fd716a0 100644
--- a/library/Zend/Barcode/Object/Codabar.php
+++ b/library/Zend/Barcode/Object/Codabar.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Codabar extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Code128.php b/library/Zend/Barcode/Object/Code128.php
index 061b356da3a..0f8b2387a3b 100644
--- a/library/Zend/Barcode/Object/Code128.php
+++ b/library/Zend/Barcode/Object/Code128.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code128 extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Code25.php b/library/Zend/Barcode/Object/Code25.php
index f68eee8f38c..a988e059b74 100644
--- a/library/Zend/Barcode/Object/Code25.php
+++ b/library/Zend/Barcode/Object/Code25.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code25 extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Code25interleaved.php b/library/Zend/Barcode/Object/Code25interleaved.php
index a28b883f10f..f3aabdda0b8 100644
--- a/library/Zend/Barcode/Object/Code25interleaved.php
+++ b/library/Zend/Barcode/Object/Code25interleaved.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code25interleaved extends Code25
 {
diff --git a/library/Zend/Barcode/Object/Code39.php b/library/Zend/Barcode/Object/Code39.php
index 6fd34331f3a..f08c60db913 100644
--- a/library/Zend/Barcode/Object/Code39.php
+++ b/library/Zend/Barcode/Object/Code39.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code39 extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Ean13.php b/library/Zend/Barcode/Object/Ean13.php
index ef6b01f579d..19c6d5a6661 100644
--- a/library/Zend/Barcode/Object/Ean13.php
+++ b/library/Zend/Barcode/Object/Ean13.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean13 extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Ean2.php b/library/Zend/Barcode/Object/Ean2.php
index 0f48c3f873f..d173b5555a7 100644
--- a/library/Zend/Barcode/Object/Ean2.php
+++ b/library/Zend/Barcode/Object/Ean2.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean2 extends Ean5
 {
diff --git a/library/Zend/Barcode/Object/Ean5.php b/library/Zend/Barcode/Object/Ean5.php
index 31db14b035a..70c8c5c5b66 100644
--- a/library/Zend/Barcode/Object/Ean5.php
+++ b/library/Zend/Barcode/Object/Ean5.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean5 extends Ean13
 {
diff --git a/library/Zend/Barcode/Object/Ean8.php b/library/Zend/Barcode/Object/Ean8.php
index 4f2d9afbcc4..f997396fe96 100644
--- a/library/Zend/Barcode/Object/Ean8.php
+++ b/library/Zend/Barcode/Object/Ean8.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean8 extends Ean13
 {
diff --git a/library/Zend/Barcode/Object/Error.php b/library/Zend/Barcode/Object/Error.php
index 91078573f42..5e828378e9a 100644
--- a/library/Zend/Barcode/Object/Error.php
+++ b/library/Zend/Barcode/Object/Error.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Error extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php b/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
index 2d0f68a119a..7fc36e21473 100644
--- a/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
+++ b/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BarcodeValidationException extends InvalidArgumentException
 {
diff --git a/library/Zend/Barcode/Object/Exception/ExceptionInterface.php b/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
index 857b1d61669..5e606192ffd 100644
--- a/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
+++ b/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object\Exception;
@@ -29,9 +27,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php b/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
index 10dac76ced5..e5c6887bedd 100644
--- a/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExtensionNotLoadedException extends RuntimeException
 {
diff --git a/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php b/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
index a445e1bb3dc..2029599de95 100644
--- a/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
+++ b/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Object/Exception/OutOfRangeException.php b/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
index c2f9d23a9bf..67f30cbbd44 100644
--- a/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
+++ b/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException extends Exception\OutOfRangeException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Object/Exception/RuntimeException.php b/library/Zend/Barcode/Object/Exception/RuntimeException.php
index 5a85a6f80b2..fe89a7195c1 100644
--- a/library/Zend/Barcode/Object/Exception/RuntimeException.php
+++ b/library/Zend/Barcode/Object/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Object/Identcode.php b/library/Zend/Barcode/Object/Identcode.php
index fc07289a5ea..16eb3850b3b 100644
--- a/library/Zend/Barcode/Object/Identcode.php
+++ b/library/Zend/Barcode/Object/Identcode.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Identcode extends Code25interleaved
 {
diff --git a/library/Zend/Barcode/Object/Itf14.php b/library/Zend/Barcode/Object/Itf14.php
index 52ae6b599d8..620ec80a0ec 100644
--- a/library/Zend/Barcode/Object/Itf14.php
+++ b/library/Zend/Barcode/Object/Itf14.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Itf14 extends Code25interleaved
 {
diff --git a/library/Zend/Barcode/Object/Leitcode.php b/library/Zend/Barcode/Object/Leitcode.php
index ed9c66cca78..e89c0c4cdb3 100644
--- a/library/Zend/Barcode/Object/Leitcode.php
+++ b/library/Zend/Barcode/Object/Leitcode.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Leitcode extends Identcode
 {
diff --git a/library/Zend/Barcode/Object/ObjectInterface.php b/library/Zend/Barcode/Object/ObjectInterface.php
index db5bc576ff9..2e3e4ea4995 100644
--- a/library/Zend/Barcode/Object/ObjectInterface.php
+++ b/library/Zend/Barcode/Object/ObjectInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ObjectInterface
 {
diff --git a/library/Zend/Barcode/Object/Planet.php b/library/Zend/Barcode/Object/Planet.php
index af027a24fbd..d43e836cf74 100644
--- a/library/Zend/Barcode/Object/Planet.php
+++ b/library/Zend/Barcode/Object/Planet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Planet extends Postnet
 {
diff --git a/library/Zend/Barcode/Object/Postnet.php b/library/Zend/Barcode/Object/Postnet.php
index 33ce86f8fd0..2cf4df3ceee 100644
--- a/library/Zend/Barcode/Object/Postnet.php
+++ b/library/Zend/Barcode/Object/Postnet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Postnet extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Royalmail.php b/library/Zend/Barcode/Object/Royalmail.php
index fcfc33a5e29..1141d941695 100644
--- a/library/Zend/Barcode/Object/Royalmail.php
+++ b/library/Zend/Barcode/Object/Royalmail.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Royalmail extends AbstractObject
 {
diff --git a/library/Zend/Barcode/Object/Upca.php b/library/Zend/Barcode/Object/Upca.php
index fdfb0728215..c5a4f565a01 100644
--- a/library/Zend/Barcode/Object/Upca.php
+++ b/library/Zend/Barcode/Object/Upca.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Upca extends Ean13
 {
diff --git a/library/Zend/Barcode/Object/Upce.php b/library/Zend/Barcode/Object/Upce.php
index 6e4e72c43c6..27668e41b10 100644
--- a/library/Zend/Barcode/Object/Upce.php
+++ b/library/Zend/Barcode/Object/Upce.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Object
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Object;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Upce extends Ean13
 {
diff --git a/library/Zend/Barcode/ObjectPluginManager.php b/library/Zend/Barcode/ObjectPluginManager.php
index 032547c814d..2d952231789 100644
--- a/library/Zend/Barcode/ObjectPluginManager.php
+++ b/library/Zend/Barcode/ObjectPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ObjectPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Barcode/Renderer/AbstractRenderer.php b/library/Zend/Barcode/Renderer/AbstractRenderer.php
index 9871f33978c..b4cb161ce8f 100644
--- a/library/Zend/Barcode/Renderer/AbstractRenderer.php
+++ b/library/Zend/Barcode/Renderer/AbstractRenderer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractRenderer implements RendererInterface
 {
diff --git a/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php b/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
index c57d00c9ade..c26a9c115c6 100644
--- a/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
+++ b/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends BarcodeException
 {
diff --git a/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php b/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
index b6f7b4185a5..4f99de7eec0 100644
--- a/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
+++ b/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php b/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
index d88609e7a03..d6155208bf3 100644
--- a/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
+++ b/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException extends Exception\OutOfRangeException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Renderer/Exception/RuntimeException.php b/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
index 5395ef0179c..17dcd45f497 100644
--- a/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
+++ b/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php b/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
index 371508d41de..f879f8a4443 100644
--- a/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
+++ b/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends Exception\UnexpectedValueException implements 
     ExceptionInterface
diff --git a/library/Zend/Barcode/Renderer/Image.php b/library/Zend/Barcode/Renderer/Image.php
index 407a1544379..58770b94f26 100644
--- a/library/Zend/Barcode/Renderer/Image.php
+++ b/library/Zend/Barcode/Renderer/Image.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Image extends AbstractRenderer
 {
diff --git a/library/Zend/Barcode/Renderer/Pdf.php b/library/Zend/Barcode/Renderer/Pdf.php
index a60fc67588d..caa41493691 100644
--- a/library/Zend/Barcode/Renderer/Pdf.php
+++ b/library/Zend/Barcode/Renderer/Pdf.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Pdf extends AbstractRenderer
 {
diff --git a/library/Zend/Barcode/Renderer/RendererInterface.php b/library/Zend/Barcode/Renderer/RendererInterface.php
index a7a8faf28c1..4029dfe2d50 100644
--- a/library/Zend/Barcode/Renderer/RendererInterface.php
+++ b/library/Zend/Barcode/Renderer/RendererInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RendererInterface
 {
diff --git a/library/Zend/Barcode/Renderer/Svg.php b/library/Zend/Barcode/Renderer/Svg.php
index 570fdbedad6..b3bfa80b61c 100644
--- a/library/Zend/Barcode/Renderer/Svg.php
+++ b/library/Zend/Barcode/Renderer/Svg.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Barcode
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode\Renderer;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Svg extends AbstractRenderer
 {
diff --git a/library/Zend/Barcode/RendererPluginManager.php b/library/Zend/Barcode/RendererPluginManager.php
index ff494a0806b..fee72de140b 100644
--- a/library/Zend/Barcode/RendererPluginManager.php
+++ b/library/Zend/Barcode/RendererPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Barcode;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RendererPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Cache/Exception/BadMethodCallException.php b/library/Zend/Cache/Exception/BadMethodCallException.php
index 4aa41fa93fb..da73b1a1ac3 100644
--- a/library/Zend/Cache/Exception/BadMethodCallException.php
+++ b/library/Zend/Cache/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Cache/Exception/ExceptionInterface.php b/library/Zend/Cache/Exception/ExceptionInterface.php
index 35cae6f1ee3..4f51250799d 100644
--- a/library/Zend/Cache/Exception/ExceptionInterface.php
+++ b/library/Zend/Cache/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Cache/Exception/ExtensionNotLoadedException.php b/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
index cd063d46330..16bb4ca6f48 100644
--- a/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExtensionNotLoadedException extends RuntimeException
 {
diff --git a/library/Zend/Cache/Exception/InvalidArgumentException.php b/library/Zend/Cache/Exception/InvalidArgumentException.php
index c051e6995ab..a08e66a82ca 100644
--- a/library/Zend/Cache/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cache/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Cache/Exception/LogicException.php b/library/Zend/Cache/Exception/LogicException.php
index 6d4f4b5f3f6..eea202c2f3b 100644
--- a/library/Zend/Cache/Exception/LogicException.php
+++ b/library/Zend/Cache/Exception/LogicException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LogicException extends \LogicException implements ExceptionInterface
 {
diff --git a/library/Zend/Cache/Exception/MissingDependencyException.php b/library/Zend/Cache/Exception/MissingDependencyException.php
index 41d82b83961..4fdb0b2d550 100644
--- a/library/Zend/Cache/Exception/MissingDependencyException.php
+++ b/library/Zend/Cache/Exception/MissingDependencyException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MissingDependencyException extends RuntimeException
 {
diff --git a/library/Zend/Cache/Exception/MissingKeyException.php b/library/Zend/Cache/Exception/MissingKeyException.php
index 8dc0d70c079..ff4612b3b95 100644
--- a/library/Zend/Cache/Exception/MissingKeyException.php
+++ b/library/Zend/Cache/Exception/MissingKeyException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MissingKeyException extends RuntimeException
 {
diff --git a/library/Zend/Cache/Exception/OutOfSpaceException.php b/library/Zend/Cache/Exception/OutOfSpaceException.php
index 290592c8d13..e7a29b7d3f2 100644
--- a/library/Zend/Cache/Exception/OutOfSpaceException.php
+++ b/library/Zend/Cache/Exception/OutOfSpaceException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfSpaceException extends \OverflowException implements ExceptionInterface
 {
diff --git a/library/Zend/Cache/Exception/RuntimeException.php b/library/Zend/Cache/Exception/RuntimeException.php
index 43211337351..de2587e0a89 100644
--- a/library/Zend/Cache/Exception/RuntimeException.php
+++ b/library/Zend/Cache/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Cache/Exception/UnexpectedValueException.php b/library/Zend/Cache/Exception/UnexpectedValueException.php
index 455da7c995a..97539136f3d 100644
--- a/library/Zend/Cache/Exception/UnexpectedValueException.php
+++ b/library/Zend/Cache/Exception/UnexpectedValueException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends \UnexpectedValueException implements 
     ExceptionInterface
diff --git a/library/Zend/Cache/Exception/UnsupportedMethodCallException.php b/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
index 73a999b00a3..9a7854ab581 100644
--- a/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
+++ b/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnsupportedMethodCallException extends \BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Cache/Pattern/AbstractPattern.php b/library/Zend/Cache/Pattern/AbstractPattern.php
index 33dcc2c6e2f..9f65e8e00c4 100644
--- a/library/Zend/Cache/Pattern/AbstractPattern.php
+++ b/library/Zend/Cache/Pattern/AbstractPattern.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPattern implements PatternInterface
 {
diff --git a/library/Zend/Cache/Pattern/CallbackCache.php b/library/Zend/Cache/Pattern/CallbackCache.php
index 566039c93a4..a7b9deb8a09 100644
--- a/library/Zend/Cache/Pattern/CallbackCache.php
+++ b/library/Zend/Cache/Pattern/CallbackCache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CallbackCache extends AbstractPattern
 {
diff --git a/library/Zend/Cache/Pattern/CaptureCache.php b/library/Zend/Cache/Pattern/CaptureCache.php
index d90d5e19a4e..177c6f56cac 100644
--- a/library/Zend/Cache/Pattern/CaptureCache.php
+++ b/library/Zend/Cache/Pattern/CaptureCache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CaptureCache extends AbstractPattern
 {
diff --git a/library/Zend/Cache/Pattern/ClassCache.php b/library/Zend/Cache/Pattern/ClassCache.php
index 5b14fb54e1c..e68ac65d594 100644
--- a/library/Zend/Cache/Pattern/ClassCache.php
+++ b/library/Zend/Cache/Pattern/ClassCache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClassCache extends CallbackCache
 {
diff --git a/library/Zend/Cache/Pattern/ObjectCache.php b/library/Zend/Cache/Pattern/ObjectCache.php
index 67fac77aa07..5b7cccc2af6 100644
--- a/library/Zend/Cache/Pattern/ObjectCache.php
+++ b/library/Zend/Cache/Pattern/ObjectCache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ObjectCache extends CallbackCache
 {
diff --git a/library/Zend/Cache/Pattern/OutputCache.php b/library/Zend/Cache/Pattern/OutputCache.php
index 4f3251e7462..5d7f3676629 100644
--- a/library/Zend/Cache/Pattern/OutputCache.php
+++ b/library/Zend/Cache/Pattern/OutputCache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutputCache extends AbstractPattern
 {
diff --git a/library/Zend/Cache/Pattern/PatternInterface.php b/library/Zend/Cache/Pattern/PatternInterface.php
index 2294d31f788..e756cc84829 100644
--- a/library/Zend/Cache/Pattern/PatternInterface.php
+++ b/library/Zend/Cache/Pattern/PatternInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface PatternInterface
 {
diff --git a/library/Zend/Cache/Pattern/PatternOptions.php b/library/Zend/Cache/Pattern/PatternOptions.php
index 7dc8460abbc..430ca5810a2 100644
--- a/library/Zend/Cache/Pattern/PatternOptions.php
+++ b/library/Zend/Cache/Pattern/PatternOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Pattern;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Pattern
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PatternOptions extends AbstractOptions
 {
diff --git a/library/Zend/Cache/PatternFactory.php b/library/Zend/Cache/PatternFactory.php
index a508cf5e936..297b650b14a 100644
--- a/library/Zend/Cache/PatternFactory.php
+++ b/library/Zend/Cache/PatternFactory.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PatternFactory
 {
diff --git a/library/Zend/Cache/PatternPluginManager.php b/library/Zend/Cache/PatternPluginManager.php
index fd60d9f0014..a89e222dd12 100644
--- a/library/Zend/Cache/PatternPluginManager.php
+++ b/library/Zend/Cache/PatternPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PatternPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php b/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
index 5b9920249f4..4e1df822795 100644
--- a/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
+++ b/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -39,8 +37,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements StorageInterface, EventsCapableInterface
 {
diff --git a/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php b/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
index 35e3114ce62..43f6283b445 100644
--- a/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
+++ b/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractZendServer extends AbstractAdapter
 {
diff --git a/library/Zend/Cache/Storage/Adapter/AdapterOptions.php b/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
index 61b9c56bf55..ff076fbd805 100644
--- a/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AdapterOptions extends AbstractOptions
 {
diff --git a/library/Zend/Cache/Storage/Adapter/Apc.php b/library/Zend/Cache/Storage/Adapter/Apc.php
index df5673803f6..75f2e708ad5 100644
--- a/library/Zend/Cache/Storage/Adapter/Apc.php
+++ b/library/Zend/Cache/Storage/Adapter/Apc.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -38,8 +36,6 @@
  * @package    Zend_Cache
  * @subpackage Zend_Cache_Storage
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Apc extends AbstractAdapter implements
     ClearByPrefixInterface,
diff --git a/library/Zend/Cache/Storage/Adapter/ApcIterator.php b/library/Zend/Cache/Storage/Adapter/ApcIterator.php
index 2ee7dd8bd9a..f9a017fc1c9 100644
--- a/library/Zend/Cache/Storage/Adapter/ApcIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/ApcIterator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ApcIterator implements IteratorInterface
 {
diff --git a/library/Zend/Cache/Storage/Adapter/ApcOptions.php b/library/Zend/Cache/Storage/Adapter/ApcOptions.php
index e14b6f0e655..d4c359e5e9e 100644
--- a/library/Zend/Cache/Storage/Adapter/ApcOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/ApcOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ApcOptions extends AdapterOptions
 {
diff --git a/library/Zend/Cache/Storage/Adapter/Dba.php b/library/Zend/Cache/Storage/Adapter/Dba.php
index 75c323782d2..16854ff75c8 100644
--- a/library/Zend/Cache/Storage/Adapter/Dba.php
+++ b/library/Zend/Cache/Storage/Adapter/Dba.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
diff --git a/library/Zend/Cache/Storage/Adapter/DbaIterator.php b/library/Zend/Cache/Storage/Adapter/DbaIterator.php
index 80717650312..ce9345be0da 100644
--- a/library/Zend/Cache/Storage/Adapter/DbaIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/DbaIterator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbaIterator implements IteratorInterface
 {
diff --git a/library/Zend/Cache/Storage/Adapter/DbaOptions.php b/library/Zend/Cache/Storage/Adapter/DbaOptions.php
index 570317f8266..d5a34f54096 100644
--- a/library/Zend/Cache/Storage/Adapter/DbaOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/DbaOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbaOptions extends AdapterOptions
 {
diff --git a/library/Zend/Cache/Storage/Adapter/Filesystem.php b/library/Zend/Cache/Storage/Adapter/Filesystem.php
index c5a932544eb..df9ebdfc6f1 100644
--- a/library/Zend/Cache/Storage/Adapter/Filesystem.php
+++ b/library/Zend/Cache/Storage/Adapter/Filesystem.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -44,8 +42,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Filesystem extends AbstractAdapter implements
     AvailableSpaceCapableInterface,
diff --git a/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php b/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
index b8e37619953..bd0da348954 100644
--- a/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilesystemIterator implements IteratorInterface
 {
diff --git a/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php b/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
index 3d8e834e5cc..4b6ae143e27 100644
--- a/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilesystemOptions extends AdapterOptions
 {
diff --git a/library/Zend/Cache/Storage/Adapter/KeyListIterator.php b/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
index 12dc88fd661..7a7c5fbafd8 100644
--- a/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class KeyListIterator implements IteratorInterface, Countable
 {
diff --git a/library/Zend/Cache/Storage/Adapter/Memcached.php b/library/Zend/Cache/Storage/Adapter/Memcached.php
index 8747516b13d..bad3c143b94 100644
--- a/library/Zend/Cache/Storage/Adapter/Memcached.php
+++ b/library/Zend/Cache/Storage/Adapter/Memcached.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -38,8 +36,6 @@
  * @package    Zend_Cache
  * @subpackage Zend_Cache_Storage
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Memcached extends AbstractAdapter implements
     FlushableInterface,
diff --git a/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php b/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
index e04271ede73..273aca68cf5 100644
--- a/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MemcachedOptions extends AdapterOptions
 {
diff --git a/library/Zend/Cache/Storage/Adapter/Memory.php b/library/Zend/Cache/Storage/Adapter/Memory.php
index 7aaf3b537a4..35b7f684a1c 100644
--- a/library/Zend/Cache/Storage/Adapter/Memory.php
+++ b/library/Zend/Cache/Storage/Adapter/Memory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -37,8 +35,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Memory extends AbstractAdapter implements
     AvailableSpaceCapableInterface,
diff --git a/library/Zend/Cache/Storage/Adapter/MemoryOptions.php b/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
index 534974b03e3..09fbe09473d 100644
--- a/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MemoryOptions extends AdapterOptions
 {
diff --git a/library/Zend/Cache/Storage/Adapter/WinCache.php b/library/Zend/Cache/Storage/Adapter/WinCache.php
index 0cefddb9d82..702fa6e6fde 100644
--- a/library/Zend/Cache/Storage/Adapter/WinCache.php
+++ b/library/Zend/Cache/Storage/Adapter/WinCache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -33,8 +31,6 @@
  * @package    Zend_Cache
  * @subpackage Zend_Cache_Storage
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WinCache extends AbstractAdapter implements
     FlushableInterface,
diff --git a/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php b/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
index 09db0faddc0..b13f8baa659 100644
--- a/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WinCacheOptions extends AdapterOptions
 {
diff --git a/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php b/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
index 53f3cedc760..f32be72e810 100644
--- a/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
+++ b/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZendServerDisk
     extends AbstractZendServer
diff --git a/library/Zend/Cache/Storage/Adapter/ZendServerShm.php b/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
index 5c1f8d0beb3..49466691fe5 100644
--- a/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
+++ b/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZendServerShm
     extends AbstractZendServer
diff --git a/library/Zend/Cache/Storage/AdapterPluginManager.php b/library/Zend/Cache/Storage/AdapterPluginManager.php
index 3b4da941901..7f207dd6a33 100644
--- a/library/Zend/Cache/Storage/AdapterPluginManager.php
+++ b/library/Zend/Cache/Storage/AdapterPluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AdapterPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php b/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
index 6e1ab7442f4..e5918404b80 100644
--- a/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
+++ b/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AvailableSpaceCapableInterface
 {
diff --git a/library/Zend/Cache/Storage/Capabilities.php b/library/Zend/Cache/Storage/Capabilities.php
index 064d31fc1c2..bf7783cca94 100644
--- a/library/Zend/Cache/Storage/Capabilities.php
+++ b/library/Zend/Cache/Storage/Capabilities.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Capabilities
 {
diff --git a/library/Zend/Cache/Storage/ClearByNamespaceInterface.php b/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
index 6d1e886444c..f10e9074be3 100644
--- a/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
+++ b/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ClearByNamespaceInterface
 {
diff --git a/library/Zend/Cache/Storage/ClearByPrefixInterface.php b/library/Zend/Cache/Storage/ClearByPrefixInterface.php
index fd06c7dd2bd..411ddbd7bf3 100644
--- a/library/Zend/Cache/Storage/ClearByPrefixInterface.php
+++ b/library/Zend/Cache/Storage/ClearByPrefixInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ClearByPrefixInterface
 {
diff --git a/library/Zend/Cache/Storage/ClearExpiredInterface.php b/library/Zend/Cache/Storage/ClearExpiredInterface.php
index 906d679249b..6fb0db016ad 100644
--- a/library/Zend/Cache/Storage/ClearExpiredInterface.php
+++ b/library/Zend/Cache/Storage/ClearExpiredInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ClearExpiredInterface
 {
diff --git a/library/Zend/Cache/Storage/Event.php b/library/Zend/Cache/Storage/Event.php
index 99a9de0d214..2b682e642f1 100644
--- a/library/Zend/Cache/Storage/Event.php
+++ b/library/Zend/Cache/Storage/Event.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Event extends BaseEvent
 {
diff --git a/library/Zend/Cache/Storage/ExceptionEvent.php b/library/Zend/Cache/Storage/ExceptionEvent.php
index d7158a14d57..7ba9a5fa24d 100644
--- a/library/Zend/Cache/Storage/ExceptionEvent.php
+++ b/library/Zend/Cache/Storage/ExceptionEvent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExceptionEvent extends PostEvent
 {
diff --git a/library/Zend/Cache/Storage/FlushableInterface.php b/library/Zend/Cache/Storage/FlushableInterface.php
index 1a25f482c6d..9bb2f8ae7eb 100644
--- a/library/Zend/Cache/Storage/FlushableInterface.php
+++ b/library/Zend/Cache/Storage/FlushableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FlushableInterface
 {
diff --git a/library/Zend/Cache/Storage/IterableInterface.php b/library/Zend/Cache/Storage/IterableInterface.php
index 5197c4fcf93..654b65d0c14 100644
--- a/library/Zend/Cache/Storage/IterableInterface.php
+++ b/library/Zend/Cache/Storage/IterableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  *
  * @method IteratorInterface getIterator() Get the storage iterator
  */
diff --git a/library/Zend/Cache/Storage/IteratorInterface.php b/library/Zend/Cache/Storage/IteratorInterface.php
index 086174d48bf..58016ba04e9 100644
--- a/library/Zend/Cache/Storage/IteratorInterface.php
+++ b/library/Zend/Cache/Storage/IteratorInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface IteratorInterface extends \Iterator
 {
diff --git a/library/Zend/Cache/Storage/OptimizableInterface.php b/library/Zend/Cache/Storage/OptimizableInterface.php
index 6b426dddf5e..7bd3b084f63 100644
--- a/library/Zend/Cache/Storage/OptimizableInterface.php
+++ b/library/Zend/Cache/Storage/OptimizableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface OptimizableInterface
 {
diff --git a/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php b/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
index 4d105f2f45d..1205692a805 100644
--- a/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
+++ b/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPlugin implements PluginInterface
 {
diff --git a/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php b/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
index ae7d26bbd80..d929a1dbd25 100644
--- a/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
+++ b/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClearExpiredByFactor extends AbstractPlugin
 {
diff --git a/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php b/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
index ba64a6a401b..dec69dfdc0f 100644
--- a/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
+++ b/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExceptionHandler extends AbstractPlugin
 {
diff --git a/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php b/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
index 7710a97bad3..e21508bb572 100644
--- a/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
+++ b/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IgnoreUserAbort extends AbstractPlugin
 {
diff --git a/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php b/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
index 64d8de29303..56b7275b454 100644
--- a/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
+++ b/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OptimizeByFactor extends AbstractPlugin
 {
diff --git a/library/Zend/Cache/Storage/Plugin/PluginInterface.php b/library/Zend/Cache/Storage/Plugin/PluginInterface.php
index 802f5fac6ed..1d93c907e53 100644
--- a/library/Zend/Cache/Storage/Plugin/PluginInterface.php
+++ b/library/Zend/Cache/Storage/Plugin/PluginInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage_Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -39,8 +37,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage_Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface PluginInterface extends ListenerAggregateInterface
 {
diff --git a/library/Zend/Cache/Storage/Plugin/PluginOptions.php b/library/Zend/Cache/Storage/Plugin/PluginOptions.php
index 695782a48c2..eb3c40f687c 100644
--- a/library/Zend/Cache/Storage/Plugin/PluginOptions.php
+++ b/library/Zend/Cache/Storage/Plugin/PluginOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PluginOptions extends AbstractOptions
 {
diff --git a/library/Zend/Cache/Storage/Plugin/Serializer.php b/library/Zend/Cache/Storage/Plugin/Serializer.php
index 027091ebd9a..625b6183f49 100644
--- a/library/Zend/Cache/Storage/Plugin/Serializer.php
+++ b/library/Zend/Cache/Storage/Plugin/Serializer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage\Plugin;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Serializer extends AbstractPlugin
 {
diff --git a/library/Zend/Cache/Storage/PluginManager.php b/library/Zend/Cache/Storage/PluginManager.php
index 6caa8ca7a31..c3ef5d69f38 100644
--- a/library/Zend/Cache/Storage/PluginManager.php
+++ b/library/Zend/Cache/Storage/PluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Cache/Storage/PostEvent.php b/library/Zend/Cache/Storage/PostEvent.php
index 7fe4f28bf19..e2b8a482b74 100644
--- a/library/Zend/Cache/Storage/PostEvent.php
+++ b/library/Zend/Cache/Storage/PostEvent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PostEvent extends Event
 {
diff --git a/library/Zend/Cache/Storage/StorageInterface.php b/library/Zend/Cache/Storage/StorageInterface.php
index 7936fd0d01c..61013dd7d18 100644
--- a/library/Zend/Cache/Storage/StorageInterface.php
+++ b/library/Zend/Cache/Storage/StorageInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StorageInterface
 {
diff --git a/library/Zend/Cache/Storage/TaggableInterface.php b/library/Zend/Cache/Storage/TaggableInterface.php
index 4ca26d42dc6..93d9584856f 100644
--- a/library/Zend/Cache/Storage/TaggableInterface.php
+++ b/library/Zend/Cache/Storage/TaggableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TaggableInterface
 {
diff --git a/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php b/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
index 84222567ef3..45b0aba837d 100644
--- a/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
+++ b/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TotalSpaceCapableInterface
 {
diff --git a/library/Zend/Cache/StorageFactory.php b/library/Zend/Cache/StorageFactory.php
index 54080d01e6f..7bee6a0b9d5 100644
--- a/library/Zend/Cache/StorageFactory.php
+++ b/library/Zend/Cache/StorageFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cache;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StorageFactory
 {
diff --git a/library/Zend/Captcha/AbstractAdapter.php b/library/Zend/Captcha/AbstractAdapter.php
index 67373f01997..f32d37e30de 100644
--- a/library/Zend/Captcha/AbstractAdapter.php
+++ b/library/Zend/Captcha/AbstractAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter extends AbstractValidator implements AdapterInterface
 {
diff --git a/library/Zend/Captcha/AbstractWord.php b/library/Zend/Captcha/AbstractWord.php
index d99f3ef2f3c..acdbd43df8b 100644
--- a/library/Zend/Captcha/AbstractWord.php
+++ b/library/Zend/Captcha/AbstractWord.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractWord extends AbstractAdapter
 {
diff --git a/library/Zend/Captcha/AdapterInterface.php b/library/Zend/Captcha/AdapterInterface.php
index 30ddceaae9d..a249c061c5a 100644
--- a/library/Zend/Captcha/AdapterInterface.php
+++ b/library/Zend/Captcha/AdapterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface extends ValidatorInterface
 {
diff --git a/library/Zend/Captcha/Dumb.php b/library/Zend/Captcha/Dumb.php
index ca4b95cc6db..ff07e6c6fc4 100644
--- a/library/Zend/Captcha/Dumb.php
+++ b/library/Zend/Captcha/Dumb.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Dumb extends AbstractWord
 {
diff --git a/library/Zend/Captcha/Exception/DomainException.php b/library/Zend/Captcha/Exception/DomainException.php
index 3d62ace938e..752e8dc7fa7 100644
--- a/library/Zend/Captcha/Exception/DomainException.php
+++ b/library/Zend/Captcha/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {
diff --git a/library/Zend/Captcha/Exception/ExceptionInterface.php b/library/Zend/Captcha/Exception/ExceptionInterface.php
index b2f42cb95d9..988b240e0b4 100644
--- a/library/Zend/Captcha/Exception/ExceptionInterface.php
+++ b/library/Zend/Captcha/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php b/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
index 05d78ad6aab..ccf0669f22c 100644
--- a/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExtensionNotLoadedException extends RuntimeException
 {
diff --git a/library/Zend/Captcha/Exception/ImageNotLoadableException.php b/library/Zend/Captcha/Exception/ImageNotLoadableException.php
index 700a754d151..29d6a6155a1 100644
--- a/library/Zend/Captcha/Exception/ImageNotLoadableException.php
+++ b/library/Zend/Captcha/Exception/ImageNotLoadableException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ImageNotLoadableException extends RuntimeException
 {
diff --git a/library/Zend/Captcha/Exception/InvalidArgumentException.php b/library/Zend/Captcha/Exception/InvalidArgumentException.php
index 089d378bb69..a3c54727124 100644
--- a/library/Zend/Captcha/Exception/InvalidArgumentException.php
+++ b/library/Zend/Captcha/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Captcha/Exception/NoFontProvidedException.php b/library/Zend/Captcha/Exception/NoFontProvidedException.php
index 6aeb71d04e7..569056de6d9 100644
--- a/library/Zend/Captcha/Exception/NoFontProvidedException.php
+++ b/library/Zend/Captcha/Exception/NoFontProvidedException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha\Exception;
@@ -27,9 +25,7 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NoFontProvidedException extends InvalidArgumentException
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Captcha/Exception/RuntimeException.php b/library/Zend/Captcha/Exception/RuntimeException.php
index 2ebd4de43d8..3c8c9cf20b4 100644
--- a/library/Zend/Captcha/Exception/RuntimeException.php
+++ b/library/Zend/Captcha/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/Captcha/Factory.php b/library/Zend/Captcha/Factory.php
index 45d63cfe068..6dc48171a6c 100644
--- a/library/Zend/Captcha/Factory.php
+++ b/library/Zend/Captcha/Factory.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Captcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Captcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Factory
 {
diff --git a/library/Zend/Captcha/Figlet.php b/library/Zend/Captcha/Figlet.php
index ee69f7469db..7be4a7071b2 100644
--- a/library/Zend/Captcha/Figlet.php
+++ b/library/Zend/Captcha/Figlet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Figlet extends AbstractWord
 {
diff --git a/library/Zend/Captcha/Image.php b/library/Zend/Captcha/Image.php
index 2e906304fdc..80d410254a3 100644
--- a/library/Zend/Captcha/Image.php
+++ b/library/Zend/Captcha/Image.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Image extends AbstractWord
 {
diff --git a/library/Zend/Captcha/ReCaptcha.php b/library/Zend/Captcha/ReCaptcha.php
index 42590856569..c7db9df251b 100644
--- a/library/Zend/Captcha/ReCaptcha.php
+++ b/library/Zend/Captcha/ReCaptcha.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Captcha;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReCaptcha extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/AbstractFactory.php b/library/Zend/Cloud/AbstractFactory.php
index 731ae0b41b4..f02168cd9d4 100644
--- a/library/Zend/Cloud/AbstractFactory.php
+++ b/library/Zend/Cloud/AbstractFactory.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AbstractFactory
 {
diff --git a/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php b/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php
index a84b08bca59..25ca9e2cf76 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/DocumentService/Adapter/AdapterInterface.php b/library/Zend/Cloud/DocumentService/Adapter/AdapterInterface.php
index 1c8398b8ac5..9a8808f44e2 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/AdapterInterface.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/AdapterInterface.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/Cloud/DocumentService/Adapter/Exception/ExceptionInterface.php b/library/Zend/Cloud/DocumentService/Adapter/Exception/ExceptionInterface.php
index 9957c14022f..acf3e911b42 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/Exception/ExceptionInterface.php
@@ -5,8 +5,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter\Exception;
@@ -14,4 +12,4 @@
 use Zend\Cloud\DocumentService\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Cloud/DocumentService/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Cloud/DocumentService/Adapter/Exception/InvalidArgumentException.php
index 88207fa9e7a..257b53c0590 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/DocumentService/Adapter/Exception/OperationNotAvailableException.php b/library/Zend/Cloud/DocumentService/Adapter/Exception/OperationNotAvailableException.php
index 8bb3890be20..68721a67010 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/Exception/OperationNotAvailableException.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/Exception/OperationNotAvailableException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OperationNotAvailableException extends Exception\OperationNotAvailableException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/DocumentService/Adapter/Exception/RuntimeException.php b/library/Zend/Cloud/DocumentService/Adapter/Exception/RuntimeException.php
index 01927eea4cc..e4b289ef36b 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Cloud
  * @subpackage DocumentService_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php
index 88b106da9b7..788fc315631 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleDb extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php
index 06090a36763..a3bf8db75a8 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService_Adapter
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter\SimpleDb;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService_Adapter
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Query extends QueryInterface
 {
diff --git a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php
index 6ac3b5747f2..d672b0de3fc 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WindowsAzure extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php
index 98e6a380f46..d4bba5e21d2 100644
--- a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php
+++ b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService_Adapter
  * @subpackage WindowsAzure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Adapter\WindowsAzure;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cloud_DocumentService_Adapter
  * @subpackage WindowsAzure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Query implements QueryAdapterInterface
 {
diff --git a/library/Zend/Cloud/DocumentService/Document.php b/library/Zend/Cloud/DocumentService/Document.php
index fde1126e978..88d77b29ce5 100644
--- a/library/Zend/Cloud/DocumentService/Document.php
+++ b/library/Zend/Cloud/DocumentService/Document.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Document
     implements \ArrayAccess, \IteratorAggregate, \Countable
diff --git a/library/Zend/Cloud/DocumentService/DocumentSet.php b/library/Zend/Cloud/DocumentService/DocumentSet.php
index 1b5e53c0189..028b2cd2fc6 100644
--- a/library/Zend/Cloud/DocumentService/DocumentSet.php
+++ b/library/Zend/Cloud/DocumentService/DocumentSet.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentSet implements \Countable, \IteratorAggregate
 {
diff --git a/library/Zend/Cloud/DocumentService/Exception/ExceptionInterface.php b/library/Zend/Cloud/DocumentService/Exception/ExceptionInterface.php
index b1749fe4952..552142b9689 100644
--- a/library/Zend/Cloud/DocumentService/Exception/ExceptionInterface.php
+++ b/library/Zend/Cloud/DocumentService/Exception/ExceptionInterface.php
@@ -5,8 +5,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Exception;
@@ -14,4 +12,4 @@
 use Zend\Cloud\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Cloud/DocumentService/Exception/InvalidArgumentException.php b/library/Zend/Cloud/DocumentService/Exception/InvalidArgumentException.php
index cb07e987618..95753ac0e1f 100644
--- a/library/Zend/Cloud/DocumentService/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cloud/DocumentService/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/DocumentService/Exception/OperationNotAvailableException.php b/library/Zend/Cloud/DocumentService/Exception/OperationNotAvailableException.php
index 9c6146fa376..a0e1e4a8115 100644
--- a/library/Zend/Cloud/DocumentService/Exception/OperationNotAvailableException.php
+++ b/library/Zend/Cloud/DocumentService/Exception/OperationNotAvailableException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OperationNotAvailableException extends Exception\OperationNotAvailableException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/DocumentService/Exception/RuntimeException.php b/library/Zend/Cloud/DocumentService/Exception/RuntimeException.php
index 41d39fb7fe3..4475e117964 100644
--- a/library/Zend/Cloud/DocumentService/Exception/RuntimeException.php
+++ b/library/Zend/Cloud/DocumentService/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/DocumentService/Factory.php b/library/Zend/Cloud/DocumentService/Factory.php
index dca1bc70dce..b86d5a02058 100644
--- a/library/Zend/Cloud/DocumentService/Factory.php
+++ b/library/Zend/Cloud/DocumentService/Factory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Factory extends AbstractFactory
 {
diff --git a/library/Zend/Cloud/DocumentService/Query.php b/library/Zend/Cloud/DocumentService/Query.php
index 5d46bb2cb96..2302c46ba27 100644
--- a/library/Zend/Cloud/DocumentService/Query.php
+++ b/library/Zend/Cloud/DocumentService/Query.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Query implements QueryAdapter\QueryAdapterInterface
 {
diff --git a/library/Zend/Cloud/DocumentService/QueryAdapter/QueryAdapterInterface.php b/library/Zend/Cloud/DocumentService/QueryAdapter/QueryAdapterInterface.php
index 926ea309e42..bbab779e6c0 100644
--- a/library/Zend/Cloud/DocumentService/QueryAdapter/QueryAdapterInterface.php
+++ b/library/Zend/Cloud/DocumentService/QueryAdapter/QueryAdapterInterface.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\DocumentService\QueryAdapter;
@@ -36,8 +34,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface QueryAdapterInterface
 {
diff --git a/library/Zend/Cloud/Exception/ExceptionInterface.php b/library/Zend/Cloud/Exception/ExceptionInterface.php
index bd0107abb46..9b89aa88ddd 100644
--- a/library/Zend/Cloud/Exception/ExceptionInterface.php
+++ b/library/Zend/Cloud/Exception/ExceptionInterface.php
@@ -5,8 +5,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Exception;
diff --git a/library/Zend/Cloud/Exception/InvalidArgumentException.php b/library/Zend/Cloud/Exception/InvalidArgumentException.php
index 28aa79427c0..8a582a42cea 100644
--- a/library/Zend/Cloud/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cloud/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/Exception/OperationNotAvailableException.php b/library/Zend/Cloud/Exception/OperationNotAvailableException.php
index d2316c08e89..f5e8e70a29a 100644
--- a/library/Zend/Cloud/Exception/OperationNotAvailableException.php
+++ b/library/Zend/Cloud/Exception/OperationNotAvailableException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OperationNotAvailableException extends \Exception implements ExceptionInterface
 {}
diff --git a/library/Zend/Cloud/Exception/OutOfBoundsException.php b/library/Zend/Cloud/Exception/OutOfBoundsException.php
index c7fca0823b9..cb71280d888 100644
--- a/library/Zend/Cloud/Exception/OutOfBoundsException.php
+++ b/library/Zend/Cloud/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {}
diff --git a/library/Zend/Cloud/Exception/RuntimeException.php b/library/Zend/Cloud/Exception/RuntimeException.php
index bf49d3ff9db..50ccba8ac09 100644
--- a/library/Zend/Cloud/Exception/RuntimeException.php
+++ b/library/Zend/Cloud/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php b/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php
index 57dd6292718..72dc00cdeb8 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage DocumentService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/AdapterInterface.php b/library/Zend/Cloud/Infrastructure/Adapter/AdapterInterface.php
index d465a77b816..088db666359 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/AdapterInterface.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/AdapterInterface.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter;
@@ -14,8 +12,6 @@
  * 
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 { 
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php b/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php
index b6619e75ed8..ebc6202fad5 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ec2 extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Exception/ExceptionInterface.php b/library/Zend/Cloud/Infrastructure/Adapter/Exception/ExceptionInterface.php
index 856f9b070c7..62861157a86 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/Exception/ExceptionInterface.php
@@ -5,8 +5,6 @@
  * @category   Zend
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter\Exception;
@@ -14,4 +12,4 @@
 use Zend\Cloud\Infrastructure\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Cloud/Infrastructure/Adapter/Exception/InvalidArgumentException.php
index cea7284ef3e..3d69b9047ca 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter\Exception;
@@ -26,10 +24,8 @@
 /**
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Exception/OutOfBoundsException.php b/library/Zend/Cloud/Infrastructure/Adapter/Exception/OutOfBoundsException.php
index a105e7e8ef0..ad2f75ab6e0 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/Exception/OutOfBoundsException.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Cloud
  * @subpackage Infrastructure_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends Exception\OutOfBoundsException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Exception/RuntimeException.php b/library/Zend/Cloud/Infrastructure/Adapter/Exception/RuntimeException.php
index dd2ae5c807b..b0e3314419b 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php b/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php
index fcc8970e391..3d41d618863 100644
--- a/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php
+++ b/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Adapter;
@@ -22,8 +20,6 @@
  *
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rackspace extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/Infrastructure/Exception/ExceptionInterface.php b/library/Zend/Cloud/Infrastructure/Exception/ExceptionInterface.php
index 73273d7b174..b4939d44b4b 100644
--- a/library/Zend/Cloud/Infrastructure/Exception/ExceptionInterface.php
+++ b/library/Zend/Cloud/Infrastructure/Exception/ExceptionInterface.php
@@ -5,8 +5,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Exception;
@@ -14,4 +12,4 @@
 use Zend\Cloud\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Cloud/Infrastructure/Exception/InvalidArgumentException.php b/library/Zend/Cloud/Infrastructure/Exception/InvalidArgumentException.php
index 2ba04ca6613..35f5505e606 100644
--- a/library/Zend/Cloud/Infrastructure/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cloud/Infrastructure/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/Infrastructure/Exception/OutOfBoundsException.php b/library/Zend/Cloud/Infrastructure/Exception/OutOfBoundsException.php
index 52e1f2a4336..57241648fff 100644
--- a/library/Zend/Cloud/Infrastructure/Exception/OutOfBoundsException.php
+++ b/library/Zend/Cloud/Infrastructure/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Cloud_Infrastructure
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends Exception\OutOfBoundsException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/Infrastructure/Exception/RuntimeException.php b/library/Zend/Cloud/Infrastructure/Exception/RuntimeException.php
index abb55ff6550..d9e42958ac3 100644
--- a/library/Zend/Cloud/Infrastructure/Exception/RuntimeException.php
+++ b/library/Zend/Cloud/Infrastructure/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/Infrastructure/Factory.php b/library/Zend/Cloud/Infrastructure/Factory.php
index cf67f6b9576..e737ac69b81 100644
--- a/library/Zend/Cloud/Infrastructure/Factory.php
+++ b/library/Zend/Cloud/Infrastructure/Factory.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure;
@@ -17,8 +15,6 @@
  * 
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Factory extends AbstractFactory
 {
diff --git a/library/Zend/Cloud/Infrastructure/Image.php b/library/Zend/Cloud/Infrastructure/Image.php
index a7a9aad2d6a..d915b363976 100644
--- a/library/Zend/Cloud/Infrastructure/Image.php
+++ b/library/Zend/Cloud/Infrastructure/Image.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure;
@@ -14,8 +12,6 @@
  * 
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Image 
 {
diff --git a/library/Zend/Cloud/Infrastructure/ImageList.php b/library/Zend/Cloud/Infrastructure/ImageList.php
index 1145e2977fe..5143383cc0a 100644
--- a/library/Zend/Cloud/Infrastructure/ImageList.php
+++ b/library/Zend/Cloud/Infrastructure/ImageList.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure;
@@ -20,8 +18,6 @@
  *
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ImageList implements Countable, Iterator, ArrayAccess
 {
diff --git a/library/Zend/Cloud/Infrastructure/Instance.php b/library/Zend/Cloud/Infrastructure/Instance.php
index 25ce9105e98..5ef31151d97 100644
--- a/library/Zend/Cloud/Infrastructure/Instance.php
+++ b/library/Zend/Cloud/Infrastructure/Instance.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure;
@@ -14,8 +12,6 @@
  *
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Instance 
 {
diff --git a/library/Zend/Cloud/Infrastructure/InstanceList.php b/library/Zend/Cloud/Infrastructure/InstanceList.php
index d1ee7744ea0..6bfbcc28631 100644
--- a/library/Zend/Cloud/Infrastructure/InstanceList.php
+++ b/library/Zend/Cloud/Infrastructure/InstanceList.php
@@ -3,8 +3,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\Infrastructure;
@@ -18,8 +16,6 @@
  *
  * @package    Zend_Cloud
  * @subpackage Infrastructure
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InstanceList implements Countable, Iterator, ArrayAccess
 {
diff --git a/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php b/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php
index 67c505e9b35..e220b06ccd1 100644
--- a/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php
+++ b/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/QueueService/Adapter/AdapterInterface.php b/library/Zend/Cloud/QueueService/Adapter/AdapterInterface.php
index c06f24f5c6c..f1b79869b5b 100644
--- a/library/Zend/Cloud/QueueService/Adapter/AdapterInterface.php
+++ b/library/Zend/Cloud/QueueService/Adapter/AdapterInterface.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
@@ -36,8 +34,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/Cloud/QueueService/Adapter/Sqs.php b/library/Zend/Cloud/QueueService/Adapter/Sqs.php
index be1916921be..cc9a2bab140 100644
--- a/library/Zend/Cloud/QueueService/Adapter/Sqs.php
+++ b/library/Zend/Cloud/QueueService/Adapter/Sqs.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sqs extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php b/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php
index 802d82ad293..9fbc5ae1a52 100644
--- a/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php
+++ b/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Adapter;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WindowsAzure extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php b/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php
index 9685288d838..0c3d3c387bb 100644
--- a/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php
+++ b/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cloud_QueueService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZendQueue extends AbstractAdapter
 {
diff --git a/library/Zend/Cloud/QueueService/Exception/ExceptionInterface.php b/library/Zend/Cloud/QueueService/Exception/ExceptionInterface.php
index 084284ce495..6e210fb1249 100644
--- a/library/Zend/Cloud/QueueService/Exception/ExceptionInterface.php
+++ b/library/Zend/Cloud/QueueService/Exception/ExceptionInterface.php
@@ -5,8 +5,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Exception;
@@ -14,4 +12,4 @@
 use Zend\Cloud\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Cloud/QueueService/Exception/InvalidArgumentException.php b/library/Zend/Cloud/QueueService/Exception/InvalidArgumentException.php
index 1e17d999580..a4c05f3716f 100644
--- a/library/Zend/Cloud/QueueService/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cloud/QueueService/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/QueueService/Exception/OperationNotAvailableException.php b/library/Zend/Cloud/QueueService/Exception/OperationNotAvailableException.php
index ce3a6d1cb8b..7e2cd8d03e5 100644
--- a/library/Zend/Cloud/QueueService/Exception/OperationNotAvailableException.php
+++ b/library/Zend/Cloud/QueueService/Exception/OperationNotAvailableException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OperationNotAvailableException extends Exception\OperationNotAvailableException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/QueueService/Exception/RuntimeException.php b/library/Zend/Cloud/QueueService/Exception/RuntimeException.php
index d22d4cddbac..fb3e7500e4a 100644
--- a/library/Zend/Cloud/QueueService/Exception/RuntimeException.php
+++ b/library/Zend/Cloud/QueueService/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/QueueService/Factory.php b/library/Zend/Cloud/QueueService/Factory.php
index 765843bcaf0..ab2e4f919c9 100644
--- a/library/Zend/Cloud/QueueService/Factory.php
+++ b/library/Zend/Cloud/QueueService/Factory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Factory extends AbstractFactory
 {
diff --git a/library/Zend/Cloud/QueueService/Message.php b/library/Zend/Cloud/QueueService/Message.php
index 7f59ea6e29a..57b5be19d4d 100644
--- a/library/Zend/Cloud/QueueService/Message.php
+++ b/library/Zend/Cloud/QueueService/Message.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Message
 {
diff --git a/library/Zend/Cloud/QueueService/MessageSet.php b/library/Zend/Cloud/QueueService/MessageSet.php
index 86d9a05f2c4..72c0330ee92 100644
--- a/library/Zend/Cloud/QueueService/MessageSet.php
+++ b/library/Zend/Cloud/QueueService/MessageSet.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\QueueService;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage QueueService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MessageSet implements \Countable, \IteratorAggregate
 {
diff --git a/library/Zend/Cloud/StorageService/Adapter/AdapterInterface.php b/library/Zend/Cloud/StorageService/Adapter/AdapterInterface.php
index d8c498a45a5..0ebcd17a0bc 100644
--- a/library/Zend/Cloud/StorageService/Adapter/AdapterInterface.php
+++ b/library/Zend/Cloud/StorageService/Adapter/AdapterInterface.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Adapter;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/Cloud/StorageService/Adapter/FileSystem.php b/library/Zend/Cloud/StorageService/Adapter/FileSystem.php
index a5b56c88e00..9871dcdf019 100644
--- a/library/Zend/Cloud/StorageService/Adapter/FileSystem.php
+++ b/library/Zend/Cloud/StorageService/Adapter/FileSystem.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FileSystem implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/StorageService/Adapter/Nirvanix.php b/library/Zend/Cloud/StorageService/Adapter/Nirvanix.php
index 4ab968da954..127a8b08ab1 100644
--- a/library/Zend/Cloud/StorageService/Adapter/Nirvanix.php
+++ b/library/Zend/Cloud/StorageService/Adapter/Nirvanix.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Adapter;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Nirvanix implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/StorageService/Adapter/Rackspace.php b/library/Zend/Cloud/StorageService/Adapter/Rackspace.php
index 9c640a8c79e..a20de0c80e1 100644
--- a/library/Zend/Cloud/StorageService/Adapter/Rackspace.php
+++ b/library/Zend/Cloud/StorageService/Adapter/Rackspace.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Adapter;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rackspace implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/StorageService/Adapter/S3.php b/library/Zend/Cloud/StorageService/Adapter/S3.php
index 290bce5358b..b5ae11b377f 100644
--- a/library/Zend/Cloud/StorageService/Adapter/S3.php
+++ b/library/Zend/Cloud/StorageService/Adapter/S3.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class S3 implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php b/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php
index 9e34a982f3c..e3edde73db5 100644
--- a/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php
+++ b/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php
@@ -13,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Cloud_StorageService
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WindowsAzure implements AdapterInterface
 {
diff --git a/library/Zend/Cloud/StorageService/Exception/ExceptionInterface.php b/library/Zend/Cloud/StorageService/Exception/ExceptionInterface.php
index 8fdbd8bcc30..bfef8ce0147 100644
--- a/library/Zend/Cloud/StorageService/Exception/ExceptionInterface.php
+++ b/library/Zend/Cloud/StorageService/Exception/ExceptionInterface.php
@@ -5,8 +5,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Exception;
@@ -14,4 +12,4 @@
 use Zend\Cloud\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Cloud/StorageService/Exception/InvalidArgumentException.php b/library/Zend/Cloud/StorageService/Exception/InvalidArgumentException.php
index d42636348ee..0b34e43da7d 100644
--- a/library/Zend/Cloud/StorageService/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cloud/StorageService/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/StorageService/Exception/OperationNotAvailableException.php b/library/Zend/Cloud/StorageService/Exception/OperationNotAvailableException.php
index 16e1eb0c022..b6760481019 100644
--- a/library/Zend/Cloud/StorageService/Exception/OperationNotAvailableException.php
+++ b/library/Zend/Cloud/StorageService/Exception/OperationNotAvailableException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OperationNotAvailableException extends Exception\OperationNotAvailableException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/StorageService/Exception/RuntimeException.php b/library/Zend/Cloud/StorageService/Exception/RuntimeException.php
index adbbfae0794..4a159dda3e4 100644
--- a/library/Zend/Cloud/StorageService/Exception/RuntimeException.php
+++ b/library/Zend/Cloud/StorageService/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Cloud/StorageService/Factory.php b/library/Zend/Cloud/StorageService/Factory.php
index 70b52167e4d..cd8d9300bb7 100644
--- a/library/Zend/Cloud/StorageService/Factory.php
+++ b/library/Zend/Cloud/StorageService/Factory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Cloud\StorageService;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Factory extends AbstractFactory
 {
diff --git a/library/Zend/Code/Annotation/AnnotationManager.php b/library/Zend/Code/Annotation/AnnotationManager.php
index 8e8a5159259..7eb250339ba 100644
--- a/library/Zend/Code/Annotation/AnnotationManager.php
+++ b/library/Zend/Code/Annotation/AnnotationManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Annotation;
@@ -38,8 +36,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AnnotationManager implements EventManagerAwareInterface
 {
diff --git a/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php b/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
index c06202a0fe8..c4732a88f2d 100644
--- a/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
+++ b/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Annotation\Parser;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DoctrineAnnotationParser implements ParserInterface
 {
diff --git a/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php b/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
index c4ca5834a29..a4dbf66e9c0 100644
--- a/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
+++ b/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Annotation\Parser;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericAnnotationParser implements ParserInterface
 {
diff --git a/library/Zend/Code/Annotation/Parser/ParserInterface.php b/library/Zend/Code/Annotation/Parser/ParserInterface.php
index d30cde9e2eb..44dfce3b94d 100644
--- a/library/Zend/Code/Annotation/Parser/ParserInterface.php
+++ b/library/Zend/Code/Annotation/Parser/ParserInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Annotation\Parser;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Code
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ParserInterface
 {
diff --git a/library/Zend/Code/Exception/BadMethodCallException.php b/library/Zend/Code/Exception/BadMethodCallException.php
index d4645e100db..32f8150d36a 100644
--- a/library/Zend/Code/Exception/BadMethodCallException.php
+++ b/library/Zend/Code/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Code/Exception/ExceptionInterface.php b/library/Zend/Code/Exception/ExceptionInterface.php
index 162519e0e20..9b431b3bddc 100644
--- a/library/Zend/Code/Exception/ExceptionInterface.php
+++ b/library/Zend/Code/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Code/Exception/InvalidArgumentException.php b/library/Zend/Code/Exception/InvalidArgumentException.php
index 21027501130..bb73b8e3944 100644
--- a/library/Zend/Code/Exception/InvalidArgumentException.php
+++ b/library/Zend/Code/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Code/Exception/RuntimeException.php b/library/Zend/Code/Exception/RuntimeException.php
index 2a925c6ea5c..674938ec32e 100644
--- a/library/Zend/Code/Exception/RuntimeException.php
+++ b/library/Zend/Code/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/Code/Generator/AbstractGenerator.php b/library/Zend/Code/Generator/AbstractGenerator.php
index a85f9270068..143cc6bc0a4 100644
--- a/library/Zend/Code/Generator/AbstractGenerator.php
+++ b/library/Zend/Code/Generator/AbstractGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractGenerator implements GeneratorInterface
 {
diff --git a/library/Zend/Code/Generator/AbstractMemberGenerator.php b/library/Zend/Code/Generator/AbstractMemberGenerator.php
index 55987d85a31..117e57bb315 100644
--- a/library/Zend/Code/Generator/AbstractMemberGenerator.php
+++ b/library/Zend/Code/Generator/AbstractMemberGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractMemberGenerator extends AbstractGenerator
 {
diff --git a/library/Zend/Code/Generator/BodyGenerator.php b/library/Zend/Code/Generator/BodyGenerator.php
index 3b84240fd09..dd256ad8135 100644
--- a/library/Zend/Code/Generator/BodyGenerator.php
+++ b/library/Zend/Code/Generator/BodyGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BodyGenerator extends AbstractGenerator
 {
diff --git a/library/Zend/Code/Generator/ClassGenerator.php b/library/Zend/Code/Generator/ClassGenerator.php
index 9f3f84a002a..65098a4f6e9 100644
--- a/library/Zend/Code/Generator/ClassGenerator.php
+++ b/library/Zend/Code/Generator/ClassGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClassGenerator extends AbstractGenerator
 {
diff --git a/library/Zend/Code/Generator/DocBlock/Tag.php b/library/Zend/Code/Generator/DocBlock/Tag.php
index 44f63276288..a6ccba38c99 100644
--- a/library/Zend/Code/Generator/DocBlock/Tag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator\DocBlock;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Tag extends AbstractGenerator
 {
diff --git a/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php b/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
index 2b66e38de4a..689ea8ea390 100644
--- a/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator\DocBlock\Tag;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LicenseTag extends Tag
 {
@@ -84,7 +80,6 @@ public function getUrl()
      */
     public function generate()
     {
-        $output = '@license ' . $this->url . ' ' . $this->description . self::LINE_FEED;
         return $output;
     }
 
diff --git a/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php b/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
index 7ca8130fd79..4e91aaded41 100644
--- a/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator\DocBlock\Tag;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParamTag extends Tag
 {
diff --git a/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php b/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
index 3da135ca3a3..c999303226e 100644
--- a/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator\DocBlock\Tag;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReturnTag extends Tag
 {
diff --git a/library/Zend/Code/Generator/DocBlockGenerator.php b/library/Zend/Code/Generator/DocBlockGenerator.php
index 1d69ddabe22..4ccbb59ef78 100644
--- a/library/Zend/Code/Generator/DocBlockGenerator.php
+++ b/library/Zend/Code/Generator/DocBlockGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocBlockGenerator extends AbstractGenerator
 {
diff --git a/library/Zend/Code/Generator/Exception/ExceptionInterface.php b/library/Zend/Code/Generator/Exception/ExceptionInterface.php
index 5ffbc2c54dd..789c6ca6d0e 100644
--- a/library/Zend/Code/Generator/Exception/ExceptionInterface.php
+++ b/library/Zend/Code/Generator/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator\Exception;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Code/Generator/Exception/InvalidArgumentException.php b/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
index 5b5d4ee4028..837911c15bc 100644
--- a/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Code/Generator/Exception/RuntimeException.php b/library/Zend/Code/Generator/Exception/RuntimeException.php
index dc4b7c64d44..5da9de534e9 100644
--- a/library/Zend/Code/Generator/Exception/RuntimeException.php
+++ b/library/Zend/Code/Generator/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Code/Generator/FileGenerator.php b/library/Zend/Code/Generator/FileGenerator.php
index 8bdc098dd2c..7a9aca2eff5 100644
--- a/library/Zend/Code/Generator/FileGenerator.php
+++ b/library/Zend/Code/Generator/FileGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FileGenerator extends AbstractGenerator
 {
diff --git a/library/Zend/Code/Generator/MethodGenerator.php b/library/Zend/Code/Generator/MethodGenerator.php
index 4b66abcc678..89f73322519 100644
--- a/library/Zend/Code/Generator/MethodGenerator.php
+++ b/library/Zend/Code/Generator/MethodGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MethodGenerator extends AbstractMemberGenerator
 {
diff --git a/library/Zend/Code/Generator/ParameterGenerator.php b/library/Zend/Code/Generator/ParameterGenerator.php
index 3cf62e303e3..7d9fdbcd4a4 100644
--- a/library/Zend/Code/Generator/ParameterGenerator.php
+++ b/library/Zend/Code/Generator/ParameterGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParameterGenerator extends AbstractGenerator
 {
diff --git a/library/Zend/Code/Generator/PropertyGenerator.php b/library/Zend/Code/Generator/PropertyGenerator.php
index fe6d472e7e8..77fe9e84418 100644
--- a/library/Zend/Code/Generator/PropertyGenerator.php
+++ b/library/Zend/Code/Generator/PropertyGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PropertyGenerator extends AbstractMemberGenerator
 {
diff --git a/library/Zend/Code/Generator/PropertyValueGenerator.php b/library/Zend/Code/Generator/PropertyValueGenerator.php
index 178106577fb..dd2542fb9bb 100644
--- a/library/Zend/Code/Generator/PropertyValueGenerator.php
+++ b/library/Zend/Code/Generator/PropertyValueGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Code_Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PropertyValueGenerator extends ValueGenerator
 {
diff --git a/library/Zend/Code/Generator/ValueGenerator.php b/library/Zend/Code/Generator/ValueGenerator.php
index 95ac4aca40a..2728eb457ed 100644
--- a/library/Zend/Code/Generator/ValueGenerator.php
+++ b/library/Zend/Code/Generator/ValueGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code_Generator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Generator;
diff --git a/library/Zend/Code/NameInformation.php b/library/Zend/Code/NameInformation.php
index 834f7a52341..794af932633 100644
--- a/library/Zend/Code/NameInformation.php
+++ b/library/Zend/Code/NameInformation.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Code
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code;
diff --git a/library/Zend/Code/Reflection/ClassReflection.php b/library/Zend/Code/Reflection/ClassReflection.php
index ed746eb9293..d00977fe33b 100644
--- a/library/Zend/Code/Reflection/ClassReflection.php
+++ b/library/Zend/Code/Reflection/ClassReflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClassReflection extends ReflectionClass implements ReflectionInterface
 {
diff --git a/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
index f2b1357b2dc..9cd5ece5aa6 100644
--- a/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\DocBlock\Tag;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericTag implements TagInterface
 {
diff --git a/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
index df80f548f4f..b03b09f0e04 100644
--- a/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\DocBlock\Tag;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MethodTag implements TagInterface
 {
@@ -134,4 +130,4 @@ public function __toString()
     {
         return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . PHP_EOL;
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
index 60275353396..bf60cb084ec 100644
--- a/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\DocBlock\Tag;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParamTag implements TagInterface
 {
diff --git a/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
index 3538a01bcbe..6f6bc121349 100644
--- a/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\DocBlock\Tag;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PropertyTag implements TagInterface
 {
diff --git a/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
index fc5b2832025..3aeea959143 100644
--- a/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\DocBlock\Tag;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReturnTag implements TagInterface
 {
diff --git a/library/Zend/Code/Reflection/DocBlockReflection.php b/library/Zend/Code/Reflection/DocBlockReflection.php
index 544dca74fe4..5228e49a03f 100644
--- a/library/Zend/Code/Reflection/DocBlockReflection.php
+++ b/library/Zend/Code/Reflection/DocBlockReflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocBlockReflection implements ReflectionInterface
 {
diff --git a/library/Zend/Code/Reflection/Exception/BadMethodCallException.php b/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
index 12a3b540ebb..34649cccb8f 100644
--- a/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
+++ b/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends Exception\BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Code/Reflection/Exception/ExceptionInterface.php b/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
index 2e18d567d12..1e750fdfd98 100644
--- a/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
+++ b/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {}
diff --git a/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php b/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
index c3c77e8d706..6d011a51357 100644
--- a/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
+++ b/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Code/Reflection/Exception/RuntimeException.php b/library/Zend/Code/Reflection/Exception/RuntimeException.php
index 334afb9b347..7241c9003f5 100644
--- a/library/Zend/Code/Reflection/Exception/RuntimeException.php
+++ b/library/Zend/Code/Reflection/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Code/Reflection/FileReflection.php b/library/Zend/Code/Reflection/FileReflection.php
index 9960f3846f9..e53410f767a 100644
--- a/library/Zend/Code/Reflection/FileReflection.php
+++ b/library/Zend/Code/Reflection/FileReflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FileReflection implements ReflectionInterface
 {
diff --git a/library/Zend/Code/Reflection/FunctionReflection.php b/library/Zend/Code/Reflection/FunctionReflection.php
index 77012a8d903..74b5cd26417 100644
--- a/library/Zend/Code/Reflection/FunctionReflection.php
+++ b/library/Zend/Code/Reflection/FunctionReflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FunctionReflection extends ReflectionFunction implements ReflectionInterface
 {
diff --git a/library/Zend/Code/Reflection/MethodReflection.php b/library/Zend/Code/Reflection/MethodReflection.php
index 66522860165..fd59262505c 100644
--- a/library/Zend/Code/Reflection/MethodReflection.php
+++ b/library/Zend/Code/Reflection/MethodReflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MethodReflection extends PhpReflectionMethod implements ReflectionInterface
 {
diff --git a/library/Zend/Code/Reflection/ParameterReflection.php b/library/Zend/Code/Reflection/ParameterReflection.php
index b944dc20727..e71621f12e4 100644
--- a/library/Zend/Code/Reflection/ParameterReflection.php
+++ b/library/Zend/Code/Reflection/ParameterReflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParameterReflection extends ReflectionParameter implements ReflectionInterface
 {
diff --git a/library/Zend/Code/Reflection/PropertyReflection.php b/library/Zend/Code/Reflection/PropertyReflection.php
index e727e599e32..91f2702f028 100644
--- a/library/Zend/Code/Reflection/PropertyReflection.php
+++ b/library/Zend/Code/Reflection/PropertyReflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Reflection;
@@ -29,8 +27,6 @@
  * @todo       implement line numbers
  * @category   Zend
  * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PropertyReflection extends PhpReflectionProperty implements ReflectionInterface
 {
diff --git a/library/Zend/Code/Scanner/TokenArrayScanner.php b/library/Zend/Code/Scanner/TokenArrayScanner.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Code/Scanner/Util.php b/library/Zend/Code/Scanner/Util.php
index fab1e062df3..cb65534ba98 100644
--- a/library/Zend/Code/Scanner/Util.php
+++ b/library/Zend/Code/Scanner/Util.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Code
  * @subpackage Scanner
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Code\Scanner;
@@ -29,7 +27,6 @@
  *
  * @package    Zend_Code
  * @subpackage Scanner
- * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
  */
 class Util
 {
diff --git a/library/Zend/Config/Config.php b/library/Zend/Config/Config.php
index 70fa03a1b4b..3b797985e73 100644
--- a/library/Zend/Config/Config.php
+++ b/library/Zend/Config/Config.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Exception/ExceptionInterface.php b/library/Zend/Config/Exception/ExceptionInterface.php
index 81b0132e3e6..af851e28655 100644
--- a/library/Zend/Config/Exception/ExceptionInterface.php
+++ b/library/Zend/Config/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Exception/InvalidArgumentException.php b/library/Zend/Config/Exception/InvalidArgumentException.php
index 9738cb02b1e..8dc03b71453 100644
--- a/library/Zend/Config/Exception/InvalidArgumentException.php
+++ b/library/Zend/Config/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Exception/RuntimeException.php b/library/Zend/Config/Exception/RuntimeException.php
index 05390c4b56f..c9478cd2a05 100644
--- a/library/Zend/Config/Exception/RuntimeException.php
+++ b/library/Zend/Config/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Factory.php b/library/Zend/Config/Factory.php
index e18b2d1eaff..77cb81a30ea 100644
--- a/library/Zend/Config/Factory.php
+++ b/library/Zend/Config/Factory.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Processor/Constant.php b/library/Zend/Config/Processor/Constant.php
index 9fbae8d4693..3fec85e8e8a 100644
--- a/library/Zend/Config/Processor/Constant.php
+++ b/library/Zend/Config/Processor/Constant.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Processor/Filter.php b/library/Zend/Config/Processor/Filter.php
index e8154da5ac0..03b5c4eff13 100644
--- a/library/Zend/Config/Processor/Filter.php
+++ b/library/Zend/Config/Processor/Filter.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Processor/ProcessorInterface.php b/library/Zend/Config/Processor/ProcessorInterface.php
index 520a18b36b5..5f850491de1 100644
--- a/library/Zend/Config/Processor/ProcessorInterface.php
+++ b/library/Zend/Config/Processor/ProcessorInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Processor/Queue.php b/library/Zend/Config/Processor/Queue.php
index e3691495116..e667089fe6e 100644
--- a/library/Zend/Config/Processor/Queue.php
+++ b/library/Zend/Config/Processor/Queue.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Processor/Token.php b/library/Zend/Config/Processor/Token.php
index cf725ba97d0..b858d715a0e 100644
--- a/library/Zend/Config/Processor/Token.php
+++ b/library/Zend/Config/Processor/Token.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Processor/Translator.php b/library/Zend/Config/Processor/Translator.php
index bb2c6238576..374f5582cca 100644
--- a/library/Zend/Config/Processor/Translator.php
+++ b/library/Zend/Config/Processor/Translator.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Reader/Ini.php b/library/Zend/Config/Reader/Ini.php
index b02df3b6a46..b4729086e89 100644
--- a/library/Zend/Config/Reader/Ini.php
+++ b/library/Zend/Config/Reader/Ini.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Reader/Json.php b/library/Zend/Config/Reader/Json.php
index 01a5f9ed80f..6f4f8d765eb 100644
--- a/library/Zend/Config/Reader/Json.php
+++ b/library/Zend/Config/Reader/Json.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Reader/ReaderInterface.php b/library/Zend/Config/Reader/ReaderInterface.php
index 4ecaf8dc7ca..1345b45fd80 100644
--- a/library/Zend/Config/Reader/ReaderInterface.php
+++ b/library/Zend/Config/Reader/ReaderInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Reader/Xml.php b/library/Zend/Config/Reader/Xml.php
index ed6ebe868d7..a55e3148bd7 100644
--- a/library/Zend/Config/Reader/Xml.php
+++ b/library/Zend/Config/Reader/Xml.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Reader/Yaml.php b/library/Zend/Config/Reader/Yaml.php
index 5c638cc5621..cca0ec267a0 100644
--- a/library/Zend/Config/Reader/Yaml.php
+++ b/library/Zend/Config/Reader/Yaml.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/ReaderPluginManager.php b/library/Zend/Config/ReaderPluginManager.php
index 008bd0d5800..84ca99df997 100644
--- a/library/Zend/Config/ReaderPluginManager.php
+++ b/library/Zend/Config/ReaderPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Config;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReaderPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Config/Writer/AbstractWriter.php b/library/Zend/Config/Writer/AbstractWriter.php
index 1d6df80fe7c..585e25e0668 100644
--- a/library/Zend/Config/Writer/AbstractWriter.php
+++ b/library/Zend/Config/Writer/AbstractWriter.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Writer/Ini.php b/library/Zend/Config/Writer/Ini.php
index cae2dc0d099..cedfaa5256e 100644
--- a/library/Zend/Config/Writer/Ini.php
+++ b/library/Zend/Config/Writer/Ini.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Writer/Json.php b/library/Zend/Config/Writer/Json.php
index 3d544ab44e9..382dfc7d638 100644
--- a/library/Zend/Config/Writer/Json.php
+++ b/library/Zend/Config/Writer/Json.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Writer/PhpArray.php b/library/Zend/Config/Writer/PhpArray.php
index e7b6a4695fe..78aa8dff99d 100644
--- a/library/Zend/Config/Writer/PhpArray.php
+++ b/library/Zend/Config/Writer/PhpArray.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Writer/WriterInterface.php b/library/Zend/Config/Writer/WriterInterface.php
index b81e96120fb..b0dc99895c3 100644
--- a/library/Zend/Config/Writer/WriterInterface.php
+++ b/library/Zend/Config/Writer/WriterInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Writer/Xml.php b/library/Zend/Config/Writer/Xml.php
index 1e6ec03f945..5cb190a3ef3 100644
--- a/library/Zend/Config/Writer/Xml.php
+++ b/library/Zend/Config/Writer/Xml.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Config/Writer/Yaml.php b/library/Zend/Config/Writer/Yaml.php
index fc4e8e8124f..b3a559f49eb 100644
--- a/library/Zend/Config/Writer/Yaml.php
+++ b/library/Zend/Config/Writer/Yaml.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Config
  */
 
diff --git a/library/Zend/Console/Exception/ExceptionInterface.php b/library/Zend/Console/Exception/ExceptionInterface.php
index e1cb31dd8a2..9aa7488414e 100644
--- a/library/Zend/Console/Exception/ExceptionInterface.php
+++ b/library/Zend/Console/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Console
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Console\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Console
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Console/Exception/RuntimeException.php b/library/Zend/Console/Exception/RuntimeException.php
index ecbc09ec6ad..a5dadb2e02f 100644
--- a/library/Zend/Console/Exception/RuntimeException.php
+++ b/library/Zend/Console/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Console_Getopt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Console\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Console_Getopt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Console/Getopt.php b/library/Zend/Console/Getopt.php
index 4a422c55488..7c56fff504f 100644
--- a/library/Zend/Console/Getopt.php
+++ b/library/Zend/Console/Getopt.php
@@ -15,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_Console
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Console;
@@ -81,8 +79,6 @@
  *
  * @category   Zend
  * @package    Zend_Console_Getopt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    Release: @package_version@
  * @since      Class available since Release 0.6.0
  *
diff --git a/library/Zend/Crypt/BlockCipher.php b/library/Zend/Crypt/BlockCipher.php
index 44f5884b017..21d9589cfe9 100644
--- a/library/Zend/Crypt/BlockCipher.php
+++ b/library/Zend/Crypt/BlockCipher.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/Exception/ExceptionInterface.php b/library/Zend/Crypt/Exception/ExceptionInterface.php
index f8f067f91a4..b3d66cc6e87 100644
--- a/library/Zend/Crypt/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
@@ -13,8 +11,6 @@
 /**
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Crypt/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Exception/InvalidArgumentException.php
index a36a0798d95..8f48d8c8509 100644
--- a/library/Zend/Crypt/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Exception;
@@ -15,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Crypt/Exception/RuntimeException.php b/library/Zend/Crypt/Exception/RuntimeException.php
index cd889deac90..13eb7a86fc4 100644
--- a/library/Zend/Crypt/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Exception;
@@ -15,8 +13,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Crypt/Hash.php b/library/Zend/Crypt/Hash.php
index 548f5a6bd41..fe810b86397 100644
--- a/library/Zend/Crypt/Hash.php
+++ b/library/Zend/Crypt/Hash.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/Hmac.php b/library/Zend/Crypt/Hmac.php
index 8c14f273da2..499776ab395 100644
--- a/library/Zend/Crypt/Hmac.php
+++ b/library/Zend/Crypt/Hmac.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php b/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
index fe14dd150a2..ab441060881 100644
--- a/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Key\Derivation\Exception;
@@ -14,8 +12,6 @@
 /**
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
index 56b418a3441..82ac839976e 100644
--- a/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Key\Derivation\Exception;
@@ -17,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php b/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
index 4806cedd783..93950a725ff 100644
--- a/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
@@ -18,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Crypt/Key/Derivation/Pbkdf2.php b/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
index fa187b6affd..cf3ae0c5d3b 100644
--- a/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
+++ b/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/Key/Derivation/SaltedS2k.php b/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
index 16f260df99a..d42ec5f3cff 100644
--- a/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
+++ b/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Key\Derivation;
@@ -14,8 +12,6 @@
  *
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SaltedS2k
 {
diff --git a/library/Zend/Crypt/Password/Bcrypt.php b/library/Zend/Crypt/Password/Bcrypt.php
index 1446dd090c4..191f602d053 100644
--- a/library/Zend/Crypt/Password/Bcrypt.php
+++ b/library/Zend/Crypt/Password/Bcrypt.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Password;
@@ -19,8 +17,6 @@
  *
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Bcrypt implements PasswordInterface
 {
diff --git a/library/Zend/Crypt/Password/Exception/ExceptionInterface.php b/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
index 306a06b42f5..4eb77de5c6b 100644
--- a/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Password\Exception;
@@ -14,8 +12,6 @@
 /**
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
index 77480002a9a..0629be1a0c1 100644
--- a/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Password\Exception;
@@ -17,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Crypt/Password/Exception/RuntimeException.php b/library/Zend/Crypt/Password/Exception/RuntimeException.php
index 340b33e9073..25869061add 100644
--- a/library/Zend/Crypt/Password/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Password/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
@@ -18,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Crypt/Password/PasswordInterface.php b/library/Zend/Crypt/Password/PasswordInterface.php
index 66cbdfed02e..97f974d364d 100644
--- a/library/Zend/Crypt/Password/PasswordInterface.php
+++ b/library/Zend/Crypt/Password/PasswordInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Password;
diff --git a/library/Zend/Crypt/PublicKey/DiffieHellman.php b/library/Zend/Crypt/PublicKey/DiffieHellman.php
index b6e31364b69..ed2d692b702 100644
--- a/library/Zend/Crypt/PublicKey/DiffieHellman.php
+++ b/library/Zend/Crypt/PublicKey/DiffieHellman.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\PublicKey;
@@ -19,8 +17,6 @@
  *
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DiffieHellman
 {
diff --git a/library/Zend/Crypt/PublicKey/Rsa.php b/library/Zend/Crypt/PublicKey/Rsa.php
index 9588aefee8f..5cb62966117 100644
--- a/library/Zend/Crypt/PublicKey/Rsa.php
+++ b/library/Zend/Crypt/PublicKey/Rsa.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php b/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
index 002e912f5a5..bb44e63e799 100644
--- a/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
@@ -13,8 +11,6 @@
 /**
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractKey
 {
diff --git a/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php b/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
index 1bd30556857..8dd9a755afc 100644
--- a/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
@@ -18,4 +16,4 @@
  * @subpackage PublicKey
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php b/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
index c3b8e139df1..8c8d5c3b154 100644
--- a/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php b/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
index 6ac6639d2d6..d0e2b6dd57b 100644
--- a/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php b/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
index e0849ed8ebb..4f21be457fd 100644
--- a/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php b/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
index a220446902e..c95b565d4b7 100644
--- a/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/PublicKey/RsaOptions.php b/library/Zend/Crypt/PublicKey/RsaOptions.php
index 4cdfaf75b26..ca6d02ea505 100644
--- a/library/Zend/Crypt/PublicKey/RsaOptions.php
+++ b/library/Zend/Crypt/PublicKey/RsaOptions.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php b/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
index 4caac25851d..2630454df0d 100644
--- a/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
@@ -15,8 +13,6 @@
 /**
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
index 4e6e49a72db..d721ee319bb 100644
--- a/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Symmetric\Exception;
@@ -17,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php b/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
index 973f457e654..eb88dfa672d 100644
--- a/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
@@ -18,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Crypt/Symmetric/Mcrypt.php b/library/Zend/Crypt/Symmetric/Mcrypt.php
index 9a911952200..330d6720a2e 100644
--- a/library/Zend/Crypt/Symmetric/Mcrypt.php
+++ b/library/Zend/Crypt/Symmetric/Mcrypt.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 
diff --git a/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php b/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
index c2bf015f65b..7f6b3133af2 100644
--- a/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
+++ b/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Symmetric\Padding;
diff --git a/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php b/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
index a3cb3c0222a..dfdf39958b0 100644
--- a/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
+++ b/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Symmetric\Padding;
@@ -14,8 +12,6 @@
  *
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Pkcs7 implements PaddingInterface
 {
diff --git a/library/Zend/Crypt/Symmetric/PaddingPluginManager.php b/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
index 703077a3287..5668babb45a 100644
--- a/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
+++ b/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Symmetric
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Crypt\Symmetric;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Crypt
  * @subpackage Symmetric
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PaddingPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Crypt/Symmetric/SymmetricInterface.php b/library/Zend/Crypt/Symmetric/SymmetricInterface.php
index 7c565e3025e..a82cbb84bba 100644
--- a/library/Zend/Crypt/Symmetric/SymmetricInterface.php
+++ b/library/Zend/Crypt/Symmetric/SymmetricInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt\Symmetric;
diff --git a/library/Zend/Crypt/SymmetricPluginManager.php b/library/Zend/Crypt/SymmetricPluginManager.php
index 13e18f79d23..9c30bb693c9 100644
--- a/library/Zend/Crypt/SymmetricPluginManager.php
+++ b/library/Zend/Crypt/SymmetricPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Crypt;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SymmetricPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Crypt/Utils.php b/library/Zend/Crypt/Utils.php
index 2ec812ff669..01dfffa715a 100644
--- a/library/Zend/Crypt/Utils.php
+++ b/library/Zend/Crypt/Utils.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Crypt
  */
 namespace Zend\Crypt;
@@ -14,8 +12,6 @@
  *
  * @category   Zend
  * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Utils
 {
diff --git a/library/Zend/Db/Adapter/Adapter.php b/library/Zend/Db/Adapter/Adapter.php
index e3c5f357f9c..75de8ff7f59 100644
--- a/library/Zend/Db/Adapter/Adapter.php
+++ b/library/Zend/Db/Adapter/Adapter.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/AdapterAwareInterface.php b/library/Zend/Db/Adapter/AdapterAwareInterface.php
index 3f948876709..a2a72d5cce0 100644
--- a/library/Zend/Db/Adapter/AdapterAwareInterface.php
+++ b/library/Zend/Db/Adapter/AdapterAwareInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/AdapterServiceFactory.php b/library/Zend/Db/Adapter/AdapterServiceFactory.php
index 492a8df53c8..5890b61df64 100644
--- a/library/Zend/Db/Adapter/AdapterServiceFactory.php
+++ b/library/Zend/Db/Adapter/AdapterServiceFactory.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/ConnectionInterface.php b/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
index 6c7f967a581..5de7b7aacd7 100644
--- a/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
+++ b/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/DriverInterface.php b/library/Zend/Db/Adapter/Driver/DriverInterface.php
index a5b5a8d9792..efc5cbe52a6 100644
--- a/library/Zend/Db/Adapter/Driver/DriverInterface.php
+++ b/library/Zend/Db/Adapter/Driver/DriverInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php b/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
index 76d7fc389f1..fbbb9cf8dc7 100644
--- a/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
+++ b/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Package
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php b/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
index b38ccb57bf7..2f5b92884dc 100644
--- a/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
+++ b/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Package
  */
 
@@ -20,4 +18,4 @@ interface DriverFeatureInterface
     public function setupDefaultFeatures();
     public function addFeature($name, $feature);
     public function getFeature($name);
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php b/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
index cd06747af44..808e2c0795f 100644
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php b/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
index d00ef5161fe..05d697a9d64 100644
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Mysqli/Result.php b/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
index 8ddb45269d6..3a0dfac39a6 100644
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php b/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
index 829246d343a..d641c1f7549 100644
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Connection.php b/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
index f86f4092cb4..905c8a9b3ce 100644
--- a/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php b/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
index 266fc01357a..ae15bad174c 100644
--- a/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Package
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php b/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
index e57e01da50a..383fb6335a6 100644
--- a/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Result.php b/library/Zend/Db/Adapter/Driver/Pdo/Result.php
index 46574f0024b..96e598a73a9 100644
--- a/library/Zend/Db/Adapter/Driver/Pdo/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Result.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Statement.php b/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
index 0210671e3c7..078de03af1c 100644
--- a/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php b/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
index 2ef5afd5980..dd776f4f91f 100644
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Feature/SequenceHelper.php b/library/Zend/Db/Adapter/Driver/Pgsql/Feature/SequenceHelper.php
index 98fa91d1a98..645f71743ec 100644
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Feature/SequenceHelper.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Feature/SequenceHelper.php
@@ -5,4 +5,4 @@
  * Date: 6/6/12
  * Time: 12:16 PM
  * To change this template use File | Settings | File Templates.
- */
\ No newline at end of file
+ */
diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php b/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
index 400a1fed56a..f7ed47524e7 100644
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Result.php b/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
index fbd89676e9d..fda73a67205 100644
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php b/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
index 9d7495e1680..5294b4f7f9a 100644
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/ResultInterface.php b/library/Zend/Db/Adapter/Driver/ResultInterface.php
index 9c37d898405..cb6f25ffbbb 100644
--- a/library/Zend/Db/Adapter/Driver/ResultInterface.php
+++ b/library/Zend/Db/Adapter/Driver/ResultInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
index 9806c69d986..322388766ed 100644
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/ErrorException.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/ErrorException.php
index 6a08b8479c4..490fbfea27c 100644
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/ErrorException.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/ErrorException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
index 95fdf40322d..238a137ebfd 100644
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
index 5fdbb731b32..fbdad78f4c1 100644
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
index 2b36aa1b77b..b6cec4026c7 100644
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Driver/StatementInterface.php b/library/Zend/Db/Adapter/Driver/StatementInterface.php
index 1ef505f85eb..a71a1055874 100644
--- a/library/Zend/Db/Adapter/Driver/StatementInterface.php
+++ b/library/Zend/Db/Adapter/Driver/StatementInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Exception/ErrorException.php b/library/Zend/Db/Adapter/Exception/ErrorException.php
index 94d1bf580ec..20675fae41d 100644
--- a/library/Zend/Db/Adapter/Exception/ErrorException.php
+++ b/library/Zend/Db/Adapter/Exception/ErrorException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Exception/ExceptionInterface.php b/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
index 15863e1ba3f..0d64ea60ddd 100644
--- a/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
index 6632394e66b..ebedbcf174c 100644
--- a/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php b/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
index 0af68df405f..b5a6c046b56 100644
--- a/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
+++ b/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Exception/InvalidQueryException.php b/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
index a5754311741..b50e359dc9a 100644
--- a/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
+++ b/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Exception/RuntimeException.php b/library/Zend/Db/Adapter/Exception/RuntimeException.php
index 170449828fb..ac61eecce0d 100644
--- a/library/Zend/Db/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Db/Adapter/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
@@ -17,4 +15,4 @@
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/Adapter/ParameterContainer.php b/library/Zend/Db/Adapter/ParameterContainer.php
index b07ef81ffdd..6637379e77a 100644
--- a/library/Zend/Db/Adapter/ParameterContainer.php
+++ b/library/Zend/Db/Adapter/ParameterContainer.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Platform/Mysql.php b/library/Zend/Db/Adapter/Platform/Mysql.php
index 8f1f030d9d9..c7da4587f0e 100644
--- a/library/Zend/Db/Adapter/Platform/Mysql.php
+++ b/library/Zend/Db/Adapter/Platform/Mysql.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Platform/PlatformInterface.php b/library/Zend/Db/Adapter/Platform/PlatformInterface.php
index 0b2851a07ba..2bf60f17062 100644
--- a/library/Zend/Db/Adapter/Platform/PlatformInterface.php
+++ b/library/Zend/Db/Adapter/Platform/PlatformInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Platform/Postgresql.php b/library/Zend/Db/Adapter/Platform/Postgresql.php
index e331344e273..81e3b33ff29 100644
--- a/library/Zend/Db/Adapter/Platform/Postgresql.php
+++ b/library/Zend/Db/Adapter/Platform/Postgresql.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Platform/Sql92.php b/library/Zend/Db/Adapter/Platform/Sql92.php
index fa1cea5257b..770a4c1a88c 100644
--- a/library/Zend/Db/Adapter/Platform/Sql92.php
+++ b/library/Zend/Db/Adapter/Platform/Sql92.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Platform/SqlServer.php b/library/Zend/Db/Adapter/Platform/SqlServer.php
index 2e1c76a3dd9..291adc29137 100644
--- a/library/Zend/Db/Adapter/Platform/SqlServer.php
+++ b/library/Zend/Db/Adapter/Platform/SqlServer.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Adapter/Platform/Sqlite.php b/library/Zend/Db/Adapter/Platform/Sqlite.php
index bd94628e592..abe0b66d2fc 100644
--- a/library/Zend/Db/Adapter/Platform/Sqlite.php
+++ b/library/Zend/Db/Adapter/Platform/Sqlite.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Exception/ExceptionInterface.php b/library/Zend/Db/Exception/ExceptionInterface.php
index 5ad9ebae1cb..72e507d6473 100644
--- a/library/Zend/Db/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
@@ -18,4 +16,4 @@
 interface ExceptionInterface
 {
 
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/Metadata/Display/TextUi.php b/library/Zend/Db/Metadata/Display/TextUi.php
index 867d83dbc3c..42d158fb683 100644
--- a/library/Zend/Db/Metadata/Display/TextUi.php
+++ b/library/Zend/Db/Metadata/Display/TextUi.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Metadata.php b/library/Zend/Db/Metadata/Metadata.php
index cd9aff5408f..b38e0974f14 100644
--- a/library/Zend/Db/Metadata/Metadata.php
+++ b/library/Zend/Db/Metadata/Metadata.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/MetadataInterface.php b/library/Zend/Db/Metadata/MetadataInterface.php
index b1784c1d4ae..1b6e6b37249 100644
--- a/library/Zend/Db/Metadata/MetadataInterface.php
+++ b/library/Zend/Db/Metadata/MetadataInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Object/AbstractTableObject.php b/library/Zend/Db/Metadata/Object/AbstractTableObject.php
index 419435d1ff2..fff592194f6 100644
--- a/library/Zend/Db/Metadata/Object/AbstractTableObject.php
+++ b/library/Zend/Db/Metadata/Object/AbstractTableObject.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Object/ColumnObject.php b/library/Zend/Db/Metadata/Object/ColumnObject.php
index af6f1595220..e6255122647 100644
--- a/library/Zend/Db/Metadata/Object/ColumnObject.php
+++ b/library/Zend/Db/Metadata/Object/ColumnObject.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 namespace Zend\Db\Metadata\Object;
diff --git a/library/Zend/Db/Metadata/Object/ConstraintObject.php b/library/Zend/Db/Metadata/Object/ConstraintObject.php
index 3bb78e4a10a..d072923743b 100644
--- a/library/Zend/Db/Metadata/Object/ConstraintObject.php
+++ b/library/Zend/Db/Metadata/Object/ConstraintObject.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Object/TableObject.php b/library/Zend/Db/Metadata/Object/TableObject.php
index 22371a883ad..c8b61883f64 100644
--- a/library/Zend/Db/Metadata/Object/TableObject.php
+++ b/library/Zend/Db/Metadata/Object/TableObject.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Object/TriggerObject.php b/library/Zend/Db/Metadata/Object/TriggerObject.php
index ef4e80913d8..5d24cbc1fb6 100644
--- a/library/Zend/Db/Metadata/Object/TriggerObject.php
+++ b/library/Zend/Db/Metadata/Object/TriggerObject.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Object/ViewObject.php b/library/Zend/Db/Metadata/Object/ViewObject.php
index 2783dd09203..ddb4656a6b8 100644
--- a/library/Zend/Db/Metadata/Object/ViewObject.php
+++ b/library/Zend/Db/Metadata/Object/ViewObject.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Source/AbstractSource.php b/library/Zend/Db/Metadata/Source/AbstractSource.php
index 7974568adfc..dbfd0afea22 100644
--- a/library/Zend/Db/Metadata/Source/AbstractSource.php
+++ b/library/Zend/Db/Metadata/Source/AbstractSource.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Source/MysqlMetadata.php b/library/Zend/Db/Metadata/Source/MysqlMetadata.php
index 9e654c37876..d7031c7706b 100644
--- a/library/Zend/Db/Metadata/Source/MysqlMetadata.php
+++ b/library/Zend/Db/Metadata/Source/MysqlMetadata.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php b/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
index 6c92b0c2ccb..957fc119dda 100644
--- a/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
+++ b/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Source/SqlServerMetadata.php b/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
index 7aaeb1f6c3d..41558fe70d4 100644
--- a/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
+++ b/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Metadata/Source/SqliteMetadata.php b/library/Zend/Db/Metadata/Source/SqliteMetadata.php
index 5a58c3237d2..0ba2077c8d8 100644
--- a/library/Zend/Db/Metadata/Source/SqliteMetadata.php
+++ b/library/Zend/Db/Metadata/Source/SqliteMetadata.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/ResultSet/AbstractResultSet.php b/library/Zend/Db/ResultSet/AbstractResultSet.php
index 6db053407db..5c85fa216e1 100644
--- a/library/Zend/Db/ResultSet/AbstractResultSet.php
+++ b/library/Zend/Db/ResultSet/AbstractResultSet.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/ResultSet/Exception.php b/library/Zend/Db/ResultSet/Exception.php
index cc128ebd262..f901c9483b3 100644
--- a/library/Zend/Db/ResultSet/Exception.php
+++ b/library/Zend/Db/ResultSet/Exception.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php b/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
index 9e7acb5cf86..96c7332fb09 100644
--- a/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/ResultSet/Exception/RuntimeException.php b/library/Zend/Db/ResultSet/Exception/RuntimeException.php
index 068b50bd3ef..aa51c2c4c91 100644
--- a/library/Zend/Db/ResultSet/Exception/RuntimeException.php
+++ b/library/Zend/Db/ResultSet/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/ResultSet/HydratingResultSet.php b/library/Zend/Db/ResultSet/HydratingResultSet.php
index a55c218eabe..c25bc48ab3a 100644
--- a/library/Zend/Db/ResultSet/HydratingResultSet.php
+++ b/library/Zend/Db/ResultSet/HydratingResultSet.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/ResultSet/ResultSet.php b/library/Zend/Db/ResultSet/ResultSet.php
index 7c76cc89b4a..436ce371b03 100644
--- a/library/Zend/Db/ResultSet/ResultSet.php
+++ b/library/Zend/Db/ResultSet/ResultSet.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/ResultSet/ResultSetInterface.php b/library/Zend/Db/ResultSet/ResultSetInterface.php
index ff5d605406e..5d2316f3f5d 100644
--- a/library/Zend/Db/ResultSet/ResultSetInterface.php
+++ b/library/Zend/Db/ResultSet/ResultSetInterface.php
@@ -20,4 +20,4 @@ public function initialize($dataSource);
      * @return mixed
      */
     public function getFieldCount();
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/RowGateway/AbstractRowGateway.php b/library/Zend/Db/RowGateway/AbstractRowGateway.php
index a7cfc9ba230..8cb608b3809 100644
--- a/library/Zend/Db/RowGateway/AbstractRowGateway.php
+++ b/library/Zend/Db/RowGateway/AbstractRowGateway.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php b/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
index 56e82e5c180..31fe8ba2ca3 100644
--- a/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php b/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
index 3c237b33c19..e0fc6466d49 100644
--- a/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
@@ -13,4 +11,4 @@
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/RowGateway/Exception/RuntimeException.php b/library/Zend/Db/RowGateway/Exception/RuntimeException.php
index c82b1b80212..1756171f058 100644
--- a/library/Zend/Db/RowGateway/Exception/RuntimeException.php
+++ b/library/Zend/Db/RowGateway/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
@@ -13,4 +11,4 @@
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/RowGateway/Feature/AbstractFeature.php b/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
index c1cd8a99106..9da0a02a3de 100644
--- a/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
+++ b/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/RowGateway/Feature/FeatureSet.php b/library/Zend/Db/RowGateway/Feature/FeatureSet.php
index db2a9f4e758..9b0095e3f5e 100644
--- a/library/Zend/Db/RowGateway/Feature/FeatureSet.php
+++ b/library/Zend/Db/RowGateway/Feature/FeatureSet.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/RowGateway/RowGateway.php b/library/Zend/Db/RowGateway/RowGateway.php
index 10f33fecd48..05dc75cae10 100644
--- a/library/Zend/Db/RowGateway/RowGateway.php
+++ b/library/Zend/Db/RowGateway/RowGateway.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/RowGateway/RowGatewayInterface.php b/library/Zend/Db/RowGateway/RowGatewayInterface.php
index b16940bb1e3..e8c9338d70e 100644
--- a/library/Zend/Db/RowGateway/RowGatewayInterface.php
+++ b/library/Zend/Db/RowGateway/RowGatewayInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/AbstractSql.php b/library/Zend/Db/Sql/AbstractSql.php
index cc2463768ff..fc9c871f241 100644
--- a/library/Zend/Db/Sql/AbstractSql.php
+++ b/library/Zend/Db/Sql/AbstractSql.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Delete.php b/library/Zend/Db/Sql/Delete.php
index 92df49087f9..490a58a60f5 100644
--- a/library/Zend/Db/Sql/Delete.php
+++ b/library/Zend/Db/Sql/Delete.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Exception/InvalidArgumentException.php b/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
index f87012e649f..0883e5e194d 100644
--- a/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Exception/RuntimeException.php b/library/Zend/Db/Sql/Exception/RuntimeException.php
index d06d22f0bf4..0a50fd7a9aa 100644
--- a/library/Zend/Db/Sql/Exception/RuntimeException.php
+++ b/library/Zend/Db/Sql/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Expression.php b/library/Zend/Db/Sql/Expression.php
index 78b57e508e2..4b137c4e015 100644
--- a/library/Zend/Db/Sql/Expression.php
+++ b/library/Zend/Db/Sql/Expression.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/ExpressionInterface.php b/library/Zend/Db/Sql/ExpressionInterface.php
index 0f7d6ca2089..8f8b63cd182 100644
--- a/library/Zend/Db/Sql/ExpressionInterface.php
+++ b/library/Zend/Db/Sql/ExpressionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Having.php b/library/Zend/Db/Sql/Having.php
index 47e89f8cd4f..637987ff888 100644
--- a/library/Zend/Db/Sql/Having.php
+++ b/library/Zend/Db/Sql/Having.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Insert.php b/library/Zend/Db/Sql/Insert.php
index 4bf5b26a289..4c38f695e43 100644
--- a/library/Zend/Db/Sql/Insert.php
+++ b/library/Zend/Db/Sql/Insert.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Platform/AbstractPlatform.php b/library/Zend/Db/Sql/Platform/AbstractPlatform.php
index aee9fcb240c..d3add21359f 100644
--- a/library/Zend/Db/Sql/Platform/AbstractPlatform.php
+++ b/library/Zend/Db/Sql/Platform/AbstractPlatform.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Platform/Platform.php b/library/Zend/Db/Sql/Platform/Platform.php
index 24f0b3e84b1..f7b12c92165 100644
--- a/library/Zend/Db/Sql/Platform/Platform.php
+++ b/library/Zend/Db/Sql/Platform/Platform.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php b/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
index 08e445aedaa..3914d4762ae 100644
--- a/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
+++ b/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php b/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
index 519be3eed26..227eb660243 100644
--- a/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
+++ b/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php b/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
index 8b1ffe25c34..aeecfa9ebb2 100644
--- a/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
+++ b/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/Between.php b/library/Zend/Db/Sql/Predicate/Between.php
index 6b4a919fe1b..5fbad967108 100644
--- a/library/Zend/Db/Sql/Predicate/Between.php
+++ b/library/Zend/Db/Sql/Predicate/Between.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/Expression.php b/library/Zend/Db/Sql/Predicate/Expression.php
index e11a8c60203..0dfbd2c7f3c 100644
--- a/library/Zend/Db/Sql/Predicate/Expression.php
+++ b/library/Zend/Db/Sql/Predicate/Expression.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/In.php b/library/Zend/Db/Sql/Predicate/In.php
index 447e2598781..4be7adc9aa4 100644
--- a/library/Zend/Db/Sql/Predicate/In.php
+++ b/library/Zend/Db/Sql/Predicate/In.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/IsNotNull.php b/library/Zend/Db/Sql/Predicate/IsNotNull.php
index 7003f45ad63..e8472ea0963 100644
--- a/library/Zend/Db/Sql/Predicate/IsNotNull.php
+++ b/library/Zend/Db/Sql/Predicate/IsNotNull.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/IsNull.php b/library/Zend/Db/Sql/Predicate/IsNull.php
index 58b71038d76..7dde7fa4054 100644
--- a/library/Zend/Db/Sql/Predicate/IsNull.php
+++ b/library/Zend/Db/Sql/Predicate/IsNull.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/Like.php b/library/Zend/Db/Sql/Predicate/Like.php
index aa29a601b9d..a3406262efc 100644
--- a/library/Zend/Db/Sql/Predicate/Like.php
+++ b/library/Zend/Db/Sql/Predicate/Like.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/Operator.php b/library/Zend/Db/Sql/Predicate/Operator.php
index 773517c604d..dc831c2368c 100644
--- a/library/Zend/Db/Sql/Predicate/Operator.php
+++ b/library/Zend/Db/Sql/Predicate/Operator.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/Predicate.php b/library/Zend/Db/Sql/Predicate/Predicate.php
index e1b9a3c9d34..14d19250080 100644
--- a/library/Zend/Db/Sql/Predicate/Predicate.php
+++ b/library/Zend/Db/Sql/Predicate/Predicate.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/PredicateInterface.php b/library/Zend/Db/Sql/Predicate/PredicateInterface.php
index 3128a7921e1..cff67b6b197 100644
--- a/library/Zend/Db/Sql/Predicate/PredicateInterface.php
+++ b/library/Zend/Db/Sql/Predicate/PredicateInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Predicate/PredicateSet.php b/library/Zend/Db/Sql/Predicate/PredicateSet.php
index 35adc11254e..e7ff4bf948a 100644
--- a/library/Zend/Db/Sql/Predicate/PredicateSet.php
+++ b/library/Zend/Db/Sql/Predicate/PredicateSet.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/PreparableSqlInterface.php b/library/Zend/Db/Sql/PreparableSqlInterface.php
index 7e809fa3824..6e1e1f0710c 100644
--- a/library/Zend/Db/Sql/PreparableSqlInterface.php
+++ b/library/Zend/Db/Sql/PreparableSqlInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Select.php b/library/Zend/Db/Sql/Select.php
index 1e4b4b8f14d..ab66282b7ec 100644
--- a/library/Zend/Db/Sql/Select.php
+++ b/library/Zend/Db/Sql/Select.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 namespace Zend\Db\Sql;
diff --git a/library/Zend/Db/Sql/Sql.php b/library/Zend/Db/Sql/Sql.php
index 3a28cf99e2f..ba58635e444 100644
--- a/library/Zend/Db/Sql/Sql.php
+++ b/library/Zend/Db/Sql/Sql.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/SqlInterface.php b/library/Zend/Db/Sql/SqlInterface.php
index eb95e57effe..3073d517189 100644
--- a/library/Zend/Db/Sql/SqlInterface.php
+++ b/library/Zend/Db/Sql/SqlInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/TableIdentifier.php b/library/Zend/Db/Sql/TableIdentifier.php
index 5d7b3609a32..41608ce54fa 100644
--- a/library/Zend/Db/Sql/TableIdentifier.php
+++ b/library/Zend/Db/Sql/TableIdentifier.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Update.php b/library/Zend/Db/Sql/Update.php
index df6fbd09152..7e84ca8f3f3 100644
--- a/library/Zend/Db/Sql/Update.php
+++ b/library/Zend/Db/Sql/Update.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/Sql/Where.php b/library/Zend/Db/Sql/Where.php
index 693c3e82f22..4301359384c 100644
--- a/library/Zend/Db/Sql/Where.php
+++ b/library/Zend/Db/Sql/Where.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/AbstractTableGateway.php b/library/Zend/Db/TableGateway/AbstractTableGateway.php
index 0c34f33cb92..e516c9b0143 100644
--- a/library/Zend/Db/TableGateway/AbstractTableGateway.php
+++ b/library/Zend/Db/TableGateway/AbstractTableGateway.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php b/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
index 392685d70d4..7651446c666 100644
--- a/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php b/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
index f4083b9e941..1e4c7b72829 100644
--- a/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/Exception/RuntimeException.php b/library/Zend/Db/TableGateway/Exception/RuntimeException.php
index 221a358b1e9..39f0c4d954a 100644
--- a/library/Zend/Db/TableGateway/Exception/RuntimeException.php
+++ b/library/Zend/Db/TableGateway/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/Feature/EventFeature.php b/library/Zend/Db/TableGateway/Feature/EventFeature.php
index f5f73466749..4a70368873b 100644
--- a/library/Zend/Db/TableGateway/Feature/EventFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/EventFeature.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php b/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
index ecd8e0a2717..5e223fb14f6 100644
--- a/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
+++ b/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/Feature/FeatureSet.php b/library/Zend/Db/TableGateway/Feature/FeatureSet.php
index d395ae631d5..5180b1f2a6b 100644
--- a/library/Zend/Db/TableGateway/Feature/FeatureSet.php
+++ b/library/Zend/Db/TableGateway/Feature/FeatureSet.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php b/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
index bde682354d5..9455deb53db 100644
--- a/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
@@ -72,4 +70,4 @@ public function preInitialize()
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
index 138070edf07..cd6dcfc7bf9 100644
--- a/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
@@ -66,4 +64,4 @@ public function postSelect()
         $this->tableGateway->adapter = $this->masterAdapter;
     }
 
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Db/TableGateway/Feature/MetadataFeature.php b/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
index d928d61a99c..3ab21b27d7b 100644
--- a/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/TableGateway.php b/library/Zend/Db/TableGateway/TableGateway.php
index 6a02a932d17..2cea0781d69 100644
--- a/library/Zend/Db/TableGateway/TableGateway.php
+++ b/library/Zend/Db/TableGateway/TableGateway.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Db/TableGateway/TableGatewayInterface.php b/library/Zend/Db/TableGateway/TableGatewayInterface.php
index b3b71770b47..a2710ae87e2 100644
--- a/library/Zend/Db/TableGateway/TableGatewayInterface.php
+++ b/library/Zend/Db/TableGateway/TableGatewayInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Db
  */
 
diff --git a/library/Zend/Debug.php b/library/Zend/Debug.php
index d34abd594c0..65d16e0dee0 100644
--- a/library/Zend/Debug.php
+++ b/library/Zend/Debug.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Debug
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Debug
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Debug
 {
diff --git a/library/Zend/DocBook/ClassMethod.php b/library/Zend/DocBook/ClassMethod.php
index c63d3505593..78f0b75045a 100644
--- a/library/Zend/DocBook/ClassMethod.php
+++ b/library/Zend/DocBook/ClassMethod.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_DocBook
  */
 
diff --git a/library/Zend/DocBook/ClassParser.php b/library/Zend/DocBook/ClassParser.php
index 018ab5cce8f..e40ead6ee2d 100644
--- a/library/Zend/DocBook/ClassParser.php
+++ b/library/Zend/DocBook/ClassParser.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_DocBook
  */
 
diff --git a/library/Zend/DocBook/SkeletonGenerator.php b/library/Zend/DocBook/SkeletonGenerator.php
index 06667f20cea..6e20c7ada9b 100644
--- a/library/Zend/DocBook/SkeletonGenerator.php
+++ b/library/Zend/DocBook/SkeletonGenerator.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_DocBook
  */
 
diff --git a/library/Zend/Dojo/BuildLayer.php b/library/Zend/Dojo/BuildLayer.php
index 10303d59d03..7d3f698ada9 100644
--- a/library/Zend/Dojo/BuildLayer.php
+++ b/library/Zend/Dojo/BuildLayer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo;
@@ -29,8 +27,6 @@
  * Dojo module layer and custom build profile generation support
  *
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BuildLayer
 {
diff --git a/library/Zend/Dojo/Data.php b/library/Zend/Dojo/Data.php
index 955238d579c..63d23d981e6 100644
--- a/library/Zend/Dojo/Data.php
+++ b/library/Zend/Dojo/Data.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo;
@@ -26,8 +24,6 @@
  * dojo.data support for Zend Framework
  *
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Data implements \ArrayAccess,\IteratorAggregate,\Countable
 {
diff --git a/library/Zend/Dojo/Dojo.php b/library/Zend/Dojo/Dojo.php
index 76f68e1e96f..4296bb46600 100644
--- a/library/Zend/Dojo/Dojo.php
+++ b/library/Zend/Dojo/Dojo.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo;
@@ -27,8 +25,6 @@
  * Enable Dojo components
  *
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Dojo
 {
diff --git a/library/Zend/Dojo/Exception/ExceptionInterface.php b/library/Zend/Dojo/Exception/ExceptionInterface.php
index 4a39e1da526..5f2dabf1432 100644
--- a/library/Zend/Dojo/Exception/ExceptionInterface.php
+++ b/library/Zend/Dojo/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Exception;
@@ -24,8 +22,6 @@
  * Exception class for Zend_Dojo
  *
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Dojo/Form/Decorator/AccordionContainer.php b/library/Zend/Dojo/Form/Decorator/AccordionContainer.php
index 6ed05f255af..7dcae1c4513 100644
--- a/library/Zend/Dojo/Form/Decorator/AccordionContainer.php
+++ b/library/Zend/Dojo/Form/Decorator/AccordionContainer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AccordionContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/Decorator/AccordionPane.php b/library/Zend/Dojo/Form/Decorator/AccordionPane.php
index 9515ecc1b67..1134997a262 100644
--- a/library/Zend/Dojo/Form/Decorator/AccordionPane.php
+++ b/library/Zend/Dojo/Form/Decorator/AccordionPane.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AccordionPane extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/Decorator/BorderContainer.php b/library/Zend/Dojo/Form/Decorator/BorderContainer.php
index 840b5615122..c1cd6ab2407 100644
--- a/library/Zend/Dojo/Form/Decorator/BorderContainer.php
+++ b/library/Zend/Dojo/Form/Decorator/BorderContainer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BorderContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/Decorator/ContentPane.php b/library/Zend/Dojo/Form/Decorator/ContentPane.php
index 8529403b63e..7f473aea6ab 100644
--- a/library/Zend/Dojo/Form/Decorator/ContentPane.php
+++ b/library/Zend/Dojo/Form/Decorator/ContentPane.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ContentPane extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/Decorator/DijitContainer.php b/library/Zend/Dojo/Form/Decorator/DijitContainer.php
index 163ffa5526c..d765acf058e 100644
--- a/library/Zend/Dojo/Form/Decorator/DijitContainer.php
+++ b/library/Zend/Dojo/Form/Decorator/DijitContainer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class DijitContainer extends \Zend\Form\Decorator\AbstractDecorator
 {
diff --git a/library/Zend/Dojo/Form/Decorator/DijitElement.php b/library/Zend/Dojo/Form/Decorator/DijitElement.php
index 2cc6eea5f6f..b3173124084 100644
--- a/library/Zend/Dojo/Form/Decorator/DijitElement.php
+++ b/library/Zend/Dojo/Form/Decorator/DijitElement.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DijitElement extends ViewHelperDecorator
 {
diff --git a/library/Zend/Dojo/Form/Decorator/DijitForm.php b/library/Zend/Dojo/Form/Decorator/DijitForm.php
index 0061b858547..f480fc2de66 100644
--- a/library/Zend/Dojo/Form/Decorator/DijitForm.php
+++ b/library/Zend/Dojo/Form/Decorator/DijitForm.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DijitForm extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/Decorator/SplitContainer.php b/library/Zend/Dojo/Form/Decorator/SplitContainer.php
index 21f3085e0b0..cf2472803ae 100644
--- a/library/Zend/Dojo/Form/Decorator/SplitContainer.php
+++ b/library/Zend/Dojo/Form/Decorator/SplitContainer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SplitContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/Decorator/StackContainer.php b/library/Zend/Dojo/Form/Decorator/StackContainer.php
index dec2f8b0ddd..dad2221ab6e 100644
--- a/library/Zend/Dojo/Form/Decorator/StackContainer.php
+++ b/library/Zend/Dojo/Form/Decorator/StackContainer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StackContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/Decorator/TabContainer.php b/library/Zend/Dojo/Form/Decorator/TabContainer.php
index b5cfce740cc..ea22113a1a8 100644
--- a/library/Zend/Dojo/Form/Decorator/TabContainer.php
+++ b/library/Zend/Dojo/Form/Decorator/TabContainer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Decorator;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TabContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/Form/DisplayGroup.php b/library/Zend/Dojo/Form/DisplayGroup.php
index 34b6f083797..7222f548830 100644
--- a/library/Zend/Dojo/Form/DisplayGroup.php
+++ b/library/Zend/Dojo/Form/DisplayGroup.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DisplayGroup extends \Zend\Form\DisplayGroup
 {
diff --git a/library/Zend/Dojo/Form/Element/Button.php b/library/Zend/Dojo/Form/Element/Button.php
index d9d942a5679..499c75e490e 100644
--- a/library/Zend/Dojo/Form/Element/Button.php
+++ b/library/Zend/Dojo/Form/Element/Button.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Button extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/CheckBox.php b/library/Zend/Dojo/Form/Element/CheckBox.php
index 6700bff2d62..f1d1bd3ee1f 100644
--- a/library/Zend/Dojo/Form/Element/CheckBox.php
+++ b/library/Zend/Dojo/Form/Element/CheckBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CheckBox extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/ComboBox.php b/library/Zend/Dojo/Form/Element/ComboBox.php
index d977fdb0a97..4d19ef9cf3d 100644
--- a/library/Zend/Dojo/Form/Element/ComboBox.php
+++ b/library/Zend/Dojo/Form/Element/ComboBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ComboBox extends DijitMulti
 {
diff --git a/library/Zend/Dojo/Form/Element/CurrencyTextBox.php b/library/Zend/Dojo/Form/Element/CurrencyTextBox.php
index 261f882fbaf..02e8a722e0c 100644
--- a/library/Zend/Dojo/Form/Element/CurrencyTextBox.php
+++ b/library/Zend/Dojo/Form/Element/CurrencyTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CurrencyTextBox extends NumberTextBox
 {
diff --git a/library/Zend/Dojo/Form/Element/DateTextBox.php b/library/Zend/Dojo/Form/Element/DateTextBox.php
index 69a0f3f48cb..f8619034550 100644
--- a/library/Zend/Dojo/Form/Element/DateTextBox.php
+++ b/library/Zend/Dojo/Form/Element/DateTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DateTextBox extends ValidationTextBox
 {
diff --git a/library/Zend/Dojo/Form/Element/Dijit.php b/library/Zend/Dojo/Form/Element/Dijit.php
index dbae6a6d257..cf9285a54b4 100644
--- a/library/Zend/Dojo/Form/Element/Dijit.php
+++ b/library/Zend/Dojo/Form/Element/Dijit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Dijit extends \Zend\Form\Element
 {
diff --git a/library/Zend/Dojo/Form/Element/DijitMulti.php b/library/Zend/Dojo/Form/Element/DijitMulti.php
index e2116c08076..bc939f0e2f6 100644
--- a/library/Zend/Dojo/Form/Element/DijitMulti.php
+++ b/library/Zend/Dojo/Form/Element/DijitMulti.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class DijitMulti extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/Editor.php b/library/Zend/Dojo/Form/Element/Editor.php
index c175ab34d7a..31861200368 100644
--- a/library/Zend/Dojo/Form/Element/Editor.php
+++ b/library/Zend/Dojo/Form/Element/Editor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Editor extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/FilteringSelect.php b/library/Zend/Dojo/Form/Element/FilteringSelect.php
index 3e3b370480d..f305a6fdc22 100644
--- a/library/Zend/Dojo/Form/Element/FilteringSelect.php
+++ b/library/Zend/Dojo/Form/Element/FilteringSelect.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilteringSelect extends ComboBox
 {
diff --git a/library/Zend/Dojo/Form/Element/HorizontalSlider.php b/library/Zend/Dojo/Form/Element/HorizontalSlider.php
index 9bf70dda307..28dcc65469c 100644
--- a/library/Zend/Dojo/Form/Element/HorizontalSlider.php
+++ b/library/Zend/Dojo/Form/Element/HorizontalSlider.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HorizontalSlider extends Slider
 {
diff --git a/library/Zend/Dojo/Form/Element/NumberSpinner.php b/library/Zend/Dojo/Form/Element/NumberSpinner.php
index a5a9fd15fca..bc4aea04b0a 100644
--- a/library/Zend/Dojo/Form/Element/NumberSpinner.php
+++ b/library/Zend/Dojo/Form/Element/NumberSpinner.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumberSpinner extends ValidationTextBox
 {
diff --git a/library/Zend/Dojo/Form/Element/NumberTextBox.php b/library/Zend/Dojo/Form/Element/NumberTextBox.php
index 7da6446cd1e..9d98b693acf 100644
--- a/library/Zend/Dojo/Form/Element/NumberTextBox.php
+++ b/library/Zend/Dojo/Form/Element/NumberTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumberTextBox extends ValidationTextBox
 {
diff --git a/library/Zend/Dojo/Form/Element/PasswordTextBox.php b/library/Zend/Dojo/Form/Element/PasswordTextBox.php
index f219dc2b14d..e32f9d95116 100644
--- a/library/Zend/Dojo/Form/Element/PasswordTextBox.php
+++ b/library/Zend/Dojo/Form/Element/PasswordTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PasswordTextBox extends ValidationTextBox
 {
diff --git a/library/Zend/Dojo/Form/Element/RadioButton.php b/library/Zend/Dojo/Form/Element/RadioButton.php
index 7ad28cb4ba3..7508575fa06 100644
--- a/library/Zend/Dojo/Form/Element/RadioButton.php
+++ b/library/Zend/Dojo/Form/Element/RadioButton.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RadioButton extends DijitMulti
 {
diff --git a/library/Zend/Dojo/Form/Element/SimpleTextarea.php b/library/Zend/Dojo/Form/Element/SimpleTextarea.php
index d4a1decb2b7..58bd14834fd 100644
--- a/library/Zend/Dojo/Form/Element/SimpleTextarea.php
+++ b/library/Zend/Dojo/Form/Element/SimpleTextarea.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleTextarea extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/Slider.php b/library/Zend/Dojo/Form/Element/Slider.php
index 7eeda95a5a9..7f0273795fa 100644
--- a/library/Zend/Dojo/Form/Element/Slider.php
+++ b/library/Zend/Dojo/Form/Element/Slider.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Slider extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/SubmitButton.php b/library/Zend/Dojo/Form/Element/SubmitButton.php
index 5bddc032a75..307a2531c05 100644
--- a/library/Zend/Dojo/Form/Element/SubmitButton.php
+++ b/library/Zend/Dojo/Form/Element/SubmitButton.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SubmitButton extends Button
 {
diff --git a/library/Zend/Dojo/Form/Element/TextBox.php b/library/Zend/Dojo/Form/Element/TextBox.php
index 5327c8707c3..174b0704df6 100644
--- a/library/Zend/Dojo/Form/Element/TextBox.php
+++ b/library/Zend/Dojo/Form/Element/TextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TextBox extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/Textarea.php b/library/Zend/Dojo/Form/Element/Textarea.php
index 2d75ce4241c..46aad5d9f58 100644
--- a/library/Zend/Dojo/Form/Element/Textarea.php
+++ b/library/Zend/Dojo/Form/Element/Textarea.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Textarea extends Dijit
 {
diff --git a/library/Zend/Dojo/Form/Element/TimeTextBox.php b/library/Zend/Dojo/Form/Element/TimeTextBox.php
index 1da1c0f669f..f0fb15c4aa7 100644
--- a/library/Zend/Dojo/Form/Element/TimeTextBox.php
+++ b/library/Zend/Dojo/Form/Element/TimeTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TimeTextBox extends DateTextBox
 {
diff --git a/library/Zend/Dojo/Form/Element/ValidationTextBox.php b/library/Zend/Dojo/Form/Element/ValidationTextBox.php
index d285454e564..ce6b638bb26 100644
--- a/library/Zend/Dojo/Form/Element/ValidationTextBox.php
+++ b/library/Zend/Dojo/Form/Element/ValidationTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ValidationTextBox extends TextBox
 {
diff --git a/library/Zend/Dojo/Form/Element/VerticalSlider.php b/library/Zend/Dojo/Form/Element/VerticalSlider.php
index f84bb07a46c..aea23ff0ef5 100644
--- a/library/Zend/Dojo/Form/Element/VerticalSlider.php
+++ b/library/Zend/Dojo/Form/Element/VerticalSlider.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form\Element;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VerticalSlider extends Slider
 {
diff --git a/library/Zend/Dojo/Form/Form.php b/library/Zend/Dojo/Form/Form.php
index a3450c6c2fd..b7c1eb61788 100644
--- a/library/Zend/Dojo/Form/Form.php
+++ b/library/Zend/Dojo/Form/Form.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Form extends \Zend\Form\Form
 {
diff --git a/library/Zend/Dojo/Form/SubForm.php b/library/Zend/Dojo/Form/SubForm.php
index 0facf5d1519..0d52cf1fd2d 100644
--- a/library/Zend/Dojo/Form/SubForm.php
+++ b/library/Zend/Dojo/Form/SubForm.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\Form;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SubForm extends \Zend\Form\SubForm
 {
diff --git a/library/Zend/Dojo/View/Exception/ExceptionInterface.php b/library/Zend/Dojo/View/Exception/ExceptionInterface.php
index 3f038bffe44..62766209884 100644
--- a/library/Zend/Dojo/View/Exception/ExceptionInterface.php
+++ b/library/Zend/Dojo/View/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/Dojo/View/Helper/AccordionContainer.php b/library/Zend/Dojo/View/Helper/AccordionContainer.php
index d0daee87536..2473df97f49 100644
--- a/library/Zend/Dojo/View/Helper/AccordionContainer.php
+++ b/library/Zend/Dojo/View/Helper/AccordionContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class AccordionContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/AccordionPane.php b/library/Zend/Dojo/View/Helper/AccordionPane.php
index 07246513d08..3f69e74f50b 100644
--- a/library/Zend/Dojo/View/Helper/AccordionPane.php
+++ b/library/Zend/Dojo/View/Helper/AccordionPane.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class AccordionPane extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/BorderContainer.php b/library/Zend/Dojo/View/Helper/BorderContainer.php
index 72a4125d299..af0eaed0046 100644
--- a/library/Zend/Dojo/View/Helper/BorderContainer.php
+++ b/library/Zend/Dojo/View/Helper/BorderContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BorderContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/Button.php b/library/Zend/Dojo/View/Helper/Button.php
index eace04dfc06..687b514daf4 100644
--- a/library/Zend/Dojo/View/Helper/Button.php
+++ b/library/Zend/Dojo/View/Helper/Button.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Button extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/CheckBox.php b/library/Zend/Dojo/View/Helper/CheckBox.php
index 097ae271a8b..194ab418b56 100644
--- a/library/Zend/Dojo/View/Helper/CheckBox.php
+++ b/library/Zend/Dojo/View/Helper/CheckBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class CheckBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/ComboBox.php b/library/Zend/Dojo/View/Helper/ComboBox.php
index 5d04af4a174..b92e6ffc3cb 100644
--- a/library/Zend/Dojo/View/Helper/ComboBox.php
+++ b/library/Zend/Dojo/View/Helper/ComboBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ComboBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/ContentPane.php b/library/Zend/Dojo/View/Helper/ContentPane.php
index b56f81bebfe..2709ddcbdae 100644
--- a/library/Zend/Dojo/View/Helper/ContentPane.php
+++ b/library/Zend/Dojo/View/Helper/ContentPane.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ContentPane extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/CurrencyTextBox.php b/library/Zend/Dojo/View/Helper/CurrencyTextBox.php
index d29f95a8a28..2bac0403c02 100644
--- a/library/Zend/Dojo/View/Helper/CurrencyTextBox.php
+++ b/library/Zend/Dojo/View/Helper/CurrencyTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class CurrencyTextBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/CustomDijit.php b/library/Zend/Dojo/View/Helper/CustomDijit.php
index 543c5cf2ccc..b7550e5d7cd 100644
--- a/library/Zend/Dojo/View/Helper/CustomDijit.php
+++ b/library/Zend/Dojo/View/Helper/CustomDijit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class CustomDijit extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/DateTextBox.php b/library/Zend/Dojo/View/Helper/DateTextBox.php
index 2dfca6aa73d..1c508da36c1 100644
--- a/library/Zend/Dojo/View/Helper/DateTextBox.php
+++ b/library/Zend/Dojo/View/Helper/DateTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class DateTextBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/Dijit.php b/library/Zend/Dojo/View/Helper/Dijit.php
index 8ed90bbce86..a34943ab156 100644
--- a/library/Zend/Dojo/View/Helper/Dijit.php
+++ b/library/Zend/Dojo/View/Helper/Dijit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Dijit extends AbstractHtmlElement
 {
diff --git a/library/Zend/Dojo/View/Helper/DijitContainer.php b/library/Zend/Dojo/View/Helper/DijitContainer.php
index 2d0531acaba..77a853ff1f4 100644
--- a/library/Zend/Dojo/View/Helper/DijitContainer.php
+++ b/library/Zend/Dojo/View/Helper/DijitContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 abstract class DijitContainer extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/Dojo.php b/library/Zend/Dojo/View/Helper/Dojo.php
index 523144defb3..ecef5c4114b 100644
--- a/library/Zend/Dojo/View/Helper/Dojo.php
+++ b/library/Zend/Dojo/View/Helper/Dojo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -34,8 +32,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Dojo extends AbstractViewHelper
 {
diff --git a/library/Zend/Dojo/View/Helper/Dojo/Container.php b/library/Zend/Dojo/View/Helper/Dojo/Container.php
index 03abc832c3a..daf1bfce13f 100644
--- a/library/Zend/Dojo/View/Helper/Dojo/Container.php
+++ b/library/Zend/Dojo/View/Helper/Dojo/Container.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper\Dojo;
@@ -33,8 +31,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Container
 {
diff --git a/library/Zend/Dojo/View/Helper/DojoForm.php b/library/Zend/Dojo/View/Helper/DojoForm.php
index ac7ea85cd22..39a11732ad6 100644
--- a/library/Zend/Dojo/View/Helper/DojoForm.php
+++ b/library/Zend/Dojo/View/Helper/DojoForm.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DojoForm extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/Editor.php b/library/Zend/Dojo/View/Helper/Editor.php
index 2370df3796e..2c86f51cc2d 100644
--- a/library/Zend/Dojo/View/Helper/Editor.php
+++ b/library/Zend/Dojo/View/Helper/Editor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Editor extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/FilteringSelect.php b/library/Zend/Dojo/View/Helper/FilteringSelect.php
index 0e7146de9ca..abafce8eada 100644
--- a/library/Zend/Dojo/View/Helper/FilteringSelect.php
+++ b/library/Zend/Dojo/View/Helper/FilteringSelect.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class FilteringSelect extends ComboBox
 {
diff --git a/library/Zend/Dojo/View/Helper/HorizontalSlider.php b/library/Zend/Dojo/View/Helper/HorizontalSlider.php
index 5cf7098acdd..d9fc6bacef4 100644
--- a/library/Zend/Dojo/View/Helper/HorizontalSlider.php
+++ b/library/Zend/Dojo/View/Helper/HorizontalSlider.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class HorizontalSlider extends Slider
 {
diff --git a/library/Zend/Dojo/View/Helper/NumberSpinner.php b/library/Zend/Dojo/View/Helper/NumberSpinner.php
index a19f56c74e5..ac43df7306e 100644
--- a/library/Zend/Dojo/View/Helper/NumberSpinner.php
+++ b/library/Zend/Dojo/View/Helper/NumberSpinner.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumberSpinner extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/NumberTextBox.php b/library/Zend/Dojo/View/Helper/NumberTextBox.php
index 772ba875120..919665c9a42 100644
--- a/library/Zend/Dojo/View/Helper/NumberTextBox.php
+++ b/library/Zend/Dojo/View/Helper/NumberTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumberTextBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/PasswordTextBox.php b/library/Zend/Dojo/View/Helper/PasswordTextBox.php
index d6cb5d1ff96..506a3bcdc68 100644
--- a/library/Zend/Dojo/View/Helper/PasswordTextBox.php
+++ b/library/Zend/Dojo/View/Helper/PasswordTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PasswordTextBox extends ValidationTextBox
 {
diff --git a/library/Zend/Dojo/View/Helper/RadioButton.php b/library/Zend/Dojo/View/Helper/RadioButton.php
index 835da47a1ff..ac314be50b7 100644
--- a/library/Zend/Dojo/View/Helper/RadioButton.php
+++ b/library/Zend/Dojo/View/Helper/RadioButton.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class RadioButton extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/SimpleTextarea.php b/library/Zend/Dojo/View/Helper/SimpleTextarea.php
index ffe92a69afe..07ee2689aba 100644
--- a/library/Zend/Dojo/View/Helper/SimpleTextarea.php
+++ b/library/Zend/Dojo/View/Helper/SimpleTextarea.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleTextarea extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/Slider.php b/library/Zend/Dojo/View/Helper/Slider.php
index 67db4270c36..2180d7490f7 100644
--- a/library/Zend/Dojo/View/Helper/Slider.php
+++ b/library/Zend/Dojo/View/Helper/Slider.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 abstract class Slider extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/SplitContainer.php b/library/Zend/Dojo/View/Helper/SplitContainer.php
index 08212310089..a7a69a5766c 100644
--- a/library/Zend/Dojo/View/Helper/SplitContainer.php
+++ b/library/Zend/Dojo/View/Helper/SplitContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SplitContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/StackContainer.php b/library/Zend/Dojo/View/Helper/StackContainer.php
index b198896a498..ba26d094b87 100644
--- a/library/Zend/Dojo/View/Helper/StackContainer.php
+++ b/library/Zend/Dojo/View/Helper/StackContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class StackContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/SubmitButton.php b/library/Zend/Dojo/View/Helper/SubmitButton.php
index a54ab743eaf..57ecfc6e55f 100644
--- a/library/Zend/Dojo/View/Helper/SubmitButton.php
+++ b/library/Zend/Dojo/View/Helper/SubmitButton.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SubmitButton extends Button
 {
diff --git a/library/Zend/Dojo/View/Helper/TabContainer.php b/library/Zend/Dojo/View/Helper/TabContainer.php
index 30f0392fe13..85acb77b20c 100644
--- a/library/Zend/Dojo/View/Helper/TabContainer.php
+++ b/library/Zend/Dojo/View/Helper/TabContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TabContainer extends DijitContainer
 {
diff --git a/library/Zend/Dojo/View/Helper/TextBox.php b/library/Zend/Dojo/View/Helper/TextBox.php
index 51ec115d99e..9a649497419 100644
--- a/library/Zend/Dojo/View/Helper/TextBox.php
+++ b/library/Zend/Dojo/View/Helper/TextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class TextBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/Textarea.php b/library/Zend/Dojo/View/Helper/Textarea.php
index 8015905d19f..f67663b0308 100644
--- a/library/Zend/Dojo/View/Helper/Textarea.php
+++ b/library/Zend/Dojo/View/Helper/Textarea.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Textarea extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/TimeTextBox.php b/library/Zend/Dojo/View/Helper/TimeTextBox.php
index f09bd7da3df..f74c9ef739a 100644
--- a/library/Zend/Dojo/View/Helper/TimeTextBox.php
+++ b/library/Zend/Dojo/View/Helper/TimeTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class TimeTextBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/ValidationTextBox.php b/library/Zend/Dojo/View/Helper/ValidationTextBox.php
index 920b2fcd7bb..af6d08b8c58 100644
--- a/library/Zend/Dojo/View/Helper/ValidationTextBox.php
+++ b/library/Zend/Dojo/View/Helper/ValidationTextBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ValidationTextBox extends Dijit
 {
diff --git a/library/Zend/Dojo/View/Helper/VerticalSlider.php b/library/Zend/Dojo/View/Helper/VerticalSlider.php
index 3b598b58685..fc3f9e2a093 100644
--- a/library/Zend/Dojo/View/Helper/VerticalSlider.php
+++ b/library/Zend/Dojo/View/Helper/VerticalSlider.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class VerticalSlider extends Slider
 {
diff --git a/library/Zend/Dojo/View/HelperLoader.php b/library/Zend/Dojo/View/HelperLoader.php
index 460ce409707..bc173648d02 100644
--- a/library/Zend/Dojo/View/HelperLoader.php
+++ b/library/Zend/Dojo/View/HelperLoader.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dojo\View;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelperLoader extends PluginClassLoader
 {
diff --git a/library/Zend/Dom/Css2Xpath.php b/library/Zend/Dom/Css2Xpath.php
index ea032a686b9..d38d37d492a 100644
--- a/library/Zend/Dom/Css2Xpath.php
+++ b/library/Zend/Dom/Css2Xpath.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dom;
@@ -25,8 +23,6 @@
  *
  * @package    Zend_Dom
  * @subpackage Query
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Css2Xpath
 {
diff --git a/library/Zend/Dom/Exception/ExceptionInterface.php b/library/Zend/Dom/Exception/ExceptionInterface.php
index bb728c21d78..828322fa3b6 100644
--- a/library/Zend/Dom/Exception/ExceptionInterface.php
+++ b/library/Zend/Dom/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dom\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Dom/Exception/RuntimeException.php b/library/Zend/Dom/Exception/RuntimeException.php
index 925ece95632..42378a70554 100644
--- a/library/Zend/Dom/Exception/RuntimeException.php
+++ b/library/Zend/Dom/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dom\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Dom/NodeList.php b/library/Zend/Dom/NodeList.php
index 7e6f2ee151b..87574c9b049 100644
--- a/library/Zend/Dom/NodeList.php
+++ b/library/Zend/Dom/NodeList.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dom;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_Dom
  * @subpackage Query
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NodeList implements Iterator, Countable
 {
diff --git a/library/Zend/Dom/Query.php b/library/Zend/Dom/Query.php
index a72d21d18ba..56cf355cf67 100644
--- a/library/Zend/Dom/Query.php
+++ b/library/Zend/Dom/Query.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Dom;
@@ -28,8 +26,6 @@
  * Query DOM structures based on CSS selectors and/or XPath
  *
  * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Query
 {
diff --git a/library/Zend/Escaper/Escaper.php b/library/Zend/Escaper/Escaper.php
index cf6948dfa95..173dd483adc 100644
--- a/library/Zend/Escaper/Escaper.php
+++ b/library/Zend/Escaper/Escaper.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Escaper;
@@ -26,8 +24,6 @@
  * Context specific methods for use in secure output escaping
  *
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Escaper
 {
@@ -639,4 +635,4 @@ protected function convertEncoding($string, $to, $from)
         9829 => 'hearts',      /* black heart suit */
         9830 => 'diams',       /* black diamond suit */
     );
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Escaper/Exception/ExceptionInterface.php b/library/Zend/Escaper/Exception/ExceptionInterface.php
index f1a3bb97641..f106f9321c2 100644
--- a/library/Zend/Escaper/Exception/ExceptionInterface.php
+++ b/library/Zend/Escaper/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Escaper\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Escaper/Exception/InvalidArgumentException.php b/library/Zend/Escaper/Exception/InvalidArgumentException.php
index 9a08a90476b..6651d832d1b 100644
--- a/library/Zend/Escaper/Exception/InvalidArgumentException.php
+++ b/library/Zend/Escaper/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Escaper\Exception;
@@ -28,8 +26,6 @@
  * @uses       \InvalidArgumentException
  * @category   Zend
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException
     implements Exception\ExceptionInterface
diff --git a/library/Zend/Escaper/Exception/RuntimeException.php b/library/Zend/Escaper/Exception/RuntimeException.php
index 51283ae0f68..f25a324ea0d 100644
--- a/library/Zend/Escaper/Exception/RuntimeException.php
+++ b/library/Zend/Escaper/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Escaper\Exception;
@@ -28,8 +26,6 @@
  * @uses       \RuntimeException
  * @category   Zend
  * @package    Zend_Escaper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException
     implements Exception\ExceptionInterface
diff --git a/library/Zend/EventManager/Event.php b/library/Zend/EventManager/Event.php
index 73a2785cfd0..7968035071a 100644
--- a/library/Zend/EventManager/Event.php
+++ b/library/Zend/EventManager/Event.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Event implements EventInterface
 {
diff --git a/library/Zend/EventManager/EventInterface.php b/library/Zend/EventManager/EventInterface.php
index b4340a144dd..706448a7efc 100644
--- a/library/Zend/EventManager/EventInterface.php
+++ b/library/Zend/EventManager/EventInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface EventInterface
 {
diff --git a/library/Zend/EventManager/EventManager.php b/library/Zend/EventManager/EventManager.php
index f75ca26910d..eab6c145ef3 100644
--- a/library/Zend/EventManager/EventManager.php
+++ b/library/Zend/EventManager/EventManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -35,8 +33,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EventManager implements EventManagerInterface
 {
diff --git a/library/Zend/EventManager/EventManagerAwareInterface.php b/library/Zend/EventManager/EventManagerAwareInterface.php
index e3aff7565fc..a91b5ed0056 100644
--- a/library/Zend/EventManager/EventManagerAwareInterface.php
+++ b/library/Zend/EventManager/EventManagerAwareInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_EventManager
  * @subpackage UnitTest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_EventManager
  * @subpackage UnitTest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface EventManagerAwareInterface extends EventsCapableInterface
 {
diff --git a/library/Zend/EventManager/EventManagerInterface.php b/library/Zend/EventManager/EventManagerInterface.php
index d15c7432b71..e9b6f4d3658 100644
--- a/library/Zend/EventManager/EventManagerInterface.php
+++ b/library/Zend/EventManager/EventManagerInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface EventManagerInterface extends SharedEventManagerAwareInterface
 {
diff --git a/library/Zend/EventManager/EventsCapableInterface.php b/library/Zend/EventManager/EventsCapableInterface.php
index fe103301e49..9b1470037bf 100644
--- a/library/Zend/EventManager/EventsCapableInterface.php
+++ b/library/Zend/EventManager/EventsCapableInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface EventsCapableInterface
 {
diff --git a/library/Zend/EventManager/Exception/ExceptionInterface.php b/library/Zend/EventManager/Exception/ExceptionInterface.php
index af0e3fa12a9..3972efb3b85 100644
--- a/library/Zend/EventManager/Exception/ExceptionInterface.php
+++ b/library/Zend/EventManager/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/EventManager/Exception/InvalidArgumentException.php b/library/Zend/EventManager/Exception/InvalidArgumentException.php
index 38064b97f31..ed40c95debc 100644
--- a/library/Zend/EventManager/Exception/InvalidArgumentException.php
+++ b/library/Zend/EventManager/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/EventManager/Exception/InvalidCallbackException.php b/library/Zend/EventManager/Exception/InvalidCallbackException.php
index 0e692ee76c5..22e5d8884d3 100644
--- a/library/Zend/EventManager/Exception/InvalidCallbackException.php
+++ b/library/Zend/EventManager/Exception/InvalidCallbackException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidCallbackException extends DomainException implements ExceptionInterface
 {
diff --git a/library/Zend/EventManager/Filter/FilterInterface.php b/library/Zend/EventManager/Filter/FilterInterface.php
index 489b1fee7ad..69fdad5c05d 100644
--- a/library/Zend/EventManager/Filter/FilterInterface.php
+++ b/library/Zend/EventManager/Filter/FilterInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager\Filter;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FilterInterface
 {
diff --git a/library/Zend/EventManager/Filter/FilterIterator.php b/library/Zend/EventManager/Filter/FilterIterator.php
index 54ddcb6b06d..1915a85fa63 100644
--- a/library/Zend/EventManager/Filter/FilterIterator.php
+++ b/library/Zend/EventManager/Filter/FilterIterator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager\Filter;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilterIterator extends SplPriorityQueue
 {
diff --git a/library/Zend/EventManager/FilterChain.php b/library/Zend/EventManager/FilterChain.php
index a3b074eab66..9a68d6f5a44 100644
--- a/library/Zend/EventManager/FilterChain.php
+++ b/library/Zend/EventManager/FilterChain.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilterChain implements Filter\FilterInterface
 {
diff --git a/library/Zend/EventManager/GlobalEventManager.php b/library/Zend/EventManager/GlobalEventManager.php
index 359389e007d..b52acc90699 100644
--- a/library/Zend/EventManager/GlobalEventManager.php
+++ b/library/Zend/EventManager/GlobalEventManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GlobalEventManager
 {
diff --git a/library/Zend/EventManager/ListenerAggregateInterface.php b/library/Zend/EventManager/ListenerAggregateInterface.php
index 74b85f63e36..f8de40d3bf4 100644
--- a/library/Zend/EventManager/ListenerAggregateInterface.php
+++ b/library/Zend/EventManager/ListenerAggregateInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ListenerAggregateInterface
 {
diff --git a/library/Zend/EventManager/ProvidesEvents.php b/library/Zend/EventManager/ProvidesEvents.php
index 93593c8487c..0027a13c090 100644
--- a/library/Zend/EventManager/ProvidesEvents.php
+++ b/library/Zend/EventManager/ProvidesEvents.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 trait ProvidesEvents 
 {
diff --git a/library/Zend/EventManager/ResponseCollection.php b/library/Zend/EventManager/ResponseCollection.php
index 5fede808c9d..87710377ad3 100644
--- a/library/Zend/EventManager/ResponseCollection.php
+++ b/library/Zend/EventManager/ResponseCollection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ResponseCollection extends SplStack
 {
diff --git a/library/Zend/EventManager/SharedEventManager.php b/library/Zend/EventManager/SharedEventManager.php
index 349acb12a81..5518833eb10 100644
--- a/library/Zend/EventManager/SharedEventManager.php
+++ b/library/Zend/EventManager/SharedEventManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SharedEventManager implements SharedEventManagerInterface
 {
diff --git a/library/Zend/EventManager/SharedEventManagerAwareInterface.php b/library/Zend/EventManager/SharedEventManagerAwareInterface.php
index dbe2853af31..e9cfe65b19e 100644
--- a/library/Zend/EventManager/SharedEventManagerAwareInterface.php
+++ b/library/Zend/EventManager/SharedEventManagerAwareInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_EventManager
  * @subpackage UnitTest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_EventManager
  * @subpackage UnitTest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface SharedEventManagerAwareInterface
 {
diff --git a/library/Zend/EventManager/SharedEventManagerInterface.php b/library/Zend/EventManager/SharedEventManagerInterface.php
index 633ac415aef..1839150905f 100644
--- a/library/Zend/EventManager/SharedEventManagerInterface.php
+++ b/library/Zend/EventManager/SharedEventManagerInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface SharedEventManagerInterface
 {
diff --git a/library/Zend/EventManager/StaticEventManager.php b/library/Zend/EventManager/StaticEventManager.php
index aef5badb7bb..2e1065c4f6f 100644
--- a/library/Zend/EventManager/StaticEventManager.php
+++ b/library/Zend/EventManager/StaticEventManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\EventManager;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_EventManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StaticEventManager extends SharedEventManager
 {
diff --git a/library/Zend/Feed/Exception/BadMethodCallException.php b/library/Zend/Feed/Exception/BadMethodCallException.php
index 5f1e9a1b6a3..009f90edc2a 100644
--- a/library/Zend/Feed/Exception/BadMethodCallException.php
+++ b/library/Zend/Feed/Exception/BadMethodCallException.php
@@ -5,4 +5,4 @@
 class BadMethodCallException
     extends \BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/Exception/ExceptionInterface.php b/library/Zend/Feed/Exception/ExceptionInterface.php
index d171154620f..8eb98e2c772 100644
--- a/library/Zend/Feed/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Feed/Exception/InvalidArgumentException.php b/library/Zend/Feed/Exception/InvalidArgumentException.php
index 409df11dc82..9d92adefd4b 100644
--- a/library/Zend/Feed/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/Exception/InvalidArgumentException.php
@@ -5,4 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/Exception/RuntimeException.php b/library/Zend/Feed/Exception/RuntimeException.php
index 15733cf8e4f..19f8a4beab8 100644
--- a/library/Zend/Feed/Exception/RuntimeException.php
+++ b/library/Zend/Feed/Exception/RuntimeException.php
@@ -5,4 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/PubSubHubbub/AbstractCallback.php b/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
index f9e34c056aa..2f30e0d4274 100644
--- a/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
+++ b/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Callback
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Callback
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCallback implements CallbackInterface
 {
diff --git a/library/Zend/Feed/PubSubHubbub/CallbackInterface.php b/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
index f3ff9b21b68..d969243ec9c 100644
--- a/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
+++ b/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Callback
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Callback
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface CallbackInterface
 {
diff --git a/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php b/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
index 389bb0dadf4..20b7a0b9ceb 100644
--- a/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
@@ -5,4 +5,4 @@
 use Zend\Feed\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php b/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
index 4cf8957ba42..4d937ea9333 100644
--- a/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php b/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
index 891ffa68d9f..4ecda2730c6 100644
--- a/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
+++ b/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/PubSubHubbub/HttpResponse.php b/library/Zend/Feed/PubSubHubbub/HttpResponse.php
index 497e148525e..7c7fa0a245a 100644
--- a/library/Zend/Feed/PubSubHubbub/HttpResponse.php
+++ b/library/Zend/Feed/PubSubHubbub/HttpResponse.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpResponse
 {
diff --git a/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php b/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
index 4a91f392c21..e7e2197f609 100644
--- a/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
+++ b/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub\Model;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AbstractModel
 {
diff --git a/library/Zend/Feed/PubSubHubbub/Model/Subscription.php b/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
index fcdd3bc5fdf..ae5e5f46eb2 100644
--- a/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
+++ b/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Entity
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub\Model;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Entity
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Subscription extends AbstractModel implements SubscriptionPersistenceInterface
 {
diff --git a/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
index e527a04ab65..98a0b90f475 100644
--- a/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
+++ b/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Entity
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub\Model;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @subpackage Entity
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface SubscriptionPersistenceInterface
 {
diff --git a/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php b/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
index 90c2f723b14..7c4e313749c 100644
--- a/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
+++ b/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PubSubHubbub
 {
diff --git a/library/Zend/Feed/PubSubHubbub/Publisher.php b/library/Zend/Feed/PubSubHubbub/Publisher.php
index 71eb2f03fff..129a4716d2d 100644
--- a/library/Zend/Feed/PubSubHubbub/Publisher.php
+++ b/library/Zend/Feed/PubSubHubbub/Publisher.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Publisher
 {
diff --git a/library/Zend/Feed/PubSubHubbub/Subscriber.php b/library/Zend/Feed/PubSubHubbub/Subscriber.php
index 75fdfcdb97d..a679fa67921 100644
--- a/library/Zend/Feed/PubSubHubbub/Subscriber.php
+++ b/library/Zend/Feed/PubSubHubbub/Subscriber.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub;
@@ -31,8 +29,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Subscriber
 {
diff --git a/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php b/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
index 633379200bf..561c07f4b1f 100644
--- a/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
+++ b/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\PubSubHubbub\Subscriber;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Callback extends PubSubHubbub\AbstractCallback
 {
diff --git a/library/Zend/Feed/Reader/AbstractEntry.php b/library/Zend/Feed/Reader/AbstractEntry.php
index 09b1a36bacc..6b13f9fc8a4 100644
--- a/library/Zend/Feed/Reader/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/AbstractEntry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/AbstractFeed.php b/library/Zend/Feed/Reader/AbstractFeed.php
index b14d83bbe71..812a76684c6 100644
--- a/library/Zend/Feed/Reader/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/AbstractFeed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFeed implements Feed\FeedInterface
 {
diff --git a/library/Zend/Feed/Reader/Collection.php b/library/Zend/Feed/Reader/Collection.php
index 2d6ad9983f5..ff03d2410df 100644
--- a/library/Zend/Feed/Reader/Collection.php
+++ b/library/Zend/Feed/Reader/Collection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Collection extends \ArrayObject
 {
diff --git a/library/Zend/Feed/Reader/Collection/AbstractCollection.php b/library/Zend/Feed/Reader/Collection/AbstractCollection.php
index 59cc73b545c..9a224b91d76 100644
--- a/library/Zend/Feed/Reader/Collection/AbstractCollection.php
+++ b/library/Zend/Feed/Reader/Collection/AbstractCollection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Reader\Collection;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCollection extends \ArrayObject
 {
diff --git a/library/Zend/Feed/Reader/Collection/Author.php b/library/Zend/Feed/Reader/Collection/Author.php
index e7fcea7ee46..c647452eb97 100644
--- a/library/Zend/Feed/Reader/Collection/Author.php
+++ b/library/Zend/Feed/Reader/Collection/Author.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Reader\Collection;
@@ -23,8 +21,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Author extends AbstractCollection
 {
diff --git a/library/Zend/Feed/Reader/Collection/Category.php b/library/Zend/Feed/Reader/Collection/Category.php
index 348608537dc..55560e8970d 100644
--- a/library/Zend/Feed/Reader/Collection/Category.php
+++ b/library/Zend/Feed/Reader/Collection/Category.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Reader\Collection;
@@ -23,8 +21,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Category extends AbstractCollection
 {
diff --git a/library/Zend/Feed/Reader/Collection/Collection.php b/library/Zend/Feed/Reader/Collection/Collection.php
index 1842c37a374..24ae798ced7 100644
--- a/library/Zend/Feed/Reader/Collection/Collection.php
+++ b/library/Zend/Feed/Reader/Collection/Collection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Collection;
@@ -23,8 +21,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Collection extends \ArrayObject
 {
diff --git a/library/Zend/Feed/Reader/Entry/AbstractEntry.php b/library/Zend/Feed/Reader/Entry/AbstractEntry.php
index e2a3299ff8a..9e15a0d6746 100644
--- a/library/Zend/Feed/Reader/Entry/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/Entry/AbstractEntry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Reader\Entry;
@@ -29,8 +27,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 abstract class AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Entry/Atom.php b/library/Zend/Feed/Reader/Entry/Atom.php
index 9e09d0d9a82..5008465bf58 100644
--- a/library/Zend/Feed/Reader/Entry/Atom.php
+++ b/library/Zend/Feed/Reader/Entry/Atom.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Entry;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Atom extends AbstractEntry implements EntryInterface
 {
diff --git a/library/Zend/Feed/Reader/Entry/EntryInterface.php b/library/Zend/Feed/Reader/Entry/EntryInterface.php
index 0e88d26d7be..0f8bfb57ab7 100644
--- a/library/Zend/Feed/Reader/Entry/EntryInterface.php
+++ b/library/Zend/Feed/Reader/Entry/EntryInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Entry;
@@ -25,8 +23,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 interface EntryInterface
 {
diff --git a/library/Zend/Feed/Reader/Entry/Rss.php b/library/Zend/Feed/Reader/Entry/Rss.php
index c16a329651f..290d60271e0 100644
--- a/library/Zend/Feed/Reader/Entry/Rss.php
+++ b/library/Zend/Feed/Reader/Entry/Rss.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Entry;
@@ -29,8 +27,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Rss extends AbstractEntry implements EntryInterface
 {
diff --git a/library/Zend/Feed/Reader/Exception/BadMethodCallException.php b/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
index c21f83bf8f8..2a68204d7e2 100644
--- a/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
+++ b/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
@@ -7,4 +7,4 @@
 class BadMethodCallException
     extends Exception\BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/Reader/Exception/ExceptionInterface.php b/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
index 9ec1f6b90bb..6ad6bba34c3 100644
--- a/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
@@ -5,4 +5,4 @@
 use Zend\Feed\Exception\ExceptionInterface as Exception;
 
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php b/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
index 1deb6043928..5347acab07a 100644
--- a/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/Reader/Exception/RuntimeException.php b/library/Zend/Feed/Reader/Exception/RuntimeException.php
index c1aab932f4b..038105a2190 100644
--- a/library/Zend/Feed/Reader/Exception/RuntimeException.php
+++ b/library/Zend/Feed/Reader/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/Reader/Extension/AbstractEntry.php b/library/Zend/Feed/Reader/Extension/AbstractEntry.php
index 95f43f7ccd5..40fc996400f 100644
--- a/library/Zend/Feed/Reader/Extension/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/Extension/AbstractEntry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension;
@@ -28,8 +26,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 abstract class AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/AbstractFeed.php b/library/Zend/Feed/Reader/Extension/AbstractFeed.php
index 934e856da47..c1b70c677e9 100644
--- a/library/Zend/Feed/Reader/Extension/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/Extension/AbstractFeed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 abstract class AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/Extension/Atom/Entry.php b/library/Zend/Feed/Reader/Extension/Atom/Entry.php
index d07ed40260a..381be13c741 100644
--- a/library/Zend/Feed/Reader/Extension/Atom/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Atom/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Atom;
@@ -32,8 +30,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/Atom/Feed.php b/library/Zend/Feed/Reader/Extension/Atom/Feed.php
index 08b49746065..1c36da464b4 100644
--- a/library/Zend/Feed/Reader/Extension/Atom/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/Atom/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Atom;
@@ -30,8 +28,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends Extension\AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/Extension/Content/Entry.php b/library/Zend/Feed/Reader/Extension/Content/Entry.php
index 80e587377aa..cb87eca8d10 100644
--- a/library/Zend/Feed/Reader/Extension/Content/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Content/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Content;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php b/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
index ef00d309767..4bbf7537760 100644
--- a/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\CreativeCommons;
@@ -25,8 +23,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php b/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
index 84afa1fc5fc..738e72cd180 100644
--- a/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\CreativeCommons;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends Extension\AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php b/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
index be92136ee30..00d308be461 100644
--- a/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\DublinCore;
@@ -29,8 +27,6 @@
 /**
 * @category Zend
 * @package Reader\Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php b/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
index 3c3af4c98f9..2be86379334 100644
--- a/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\DublinCore;
@@ -28,8 +26,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends Extension\AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/Extension/Podcast/Entry.php b/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
index 3dfcd3df00b..57a909cfeb9 100644
--- a/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Podcast;
@@ -24,8 +22,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/Podcast/Feed.php b/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
index 59fdfb0b54b..e001e6d4af0 100644
--- a/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Podcast;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends Extension\AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/Extension/Slash/Entry.php b/library/Zend/Feed/Reader/Extension/Slash/Entry.php
index 93ab219f49f..e22802352f3 100644
--- a/library/Zend/Feed/Reader/Extension/Slash/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Slash/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Slash;
@@ -24,8 +22,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/Syndication/Feed.php b/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
index f078676de0a..99228004a95 100644
--- a/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Syndication;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/Extension/Thread/Entry.php b/library/Zend/Feed/Reader/Extension/Thread/Entry.php
index 23e3d7c946c..0398e6fa7c5 100644
--- a/library/Zend/Feed/Reader/Extension/Thread/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Thread/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\Thread;
@@ -25,8 +23,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php b/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
index 80e8e3d8bcc..13c5bd0b372 100644
--- a/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Extension\WellFormedWeb;
@@ -25,8 +23,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractEntry
 {
diff --git a/library/Zend/Feed/Reader/Feed/AbstractFeed.php b/library/Zend/Feed/Reader/Feed/AbstractFeed.php
index 7f948241ff5..a148133d7f2 100644
--- a/library/Zend/Feed/Reader/Feed/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/Feed/AbstractFeed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Reader\Feed;
@@ -28,8 +26,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 abstract class AbstractFeed implements FeedInterface
 {
diff --git a/library/Zend/Feed/Reader/Feed/Atom.php b/library/Zend/Feed/Reader/Feed/Atom.php
index 0c1a31b748b..849f0ec3402 100644
--- a/library/Zend/Feed/Reader/Feed/Atom.php
+++ b/library/Zend/Feed/Reader/Feed/Atom.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Feed;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Atom extends AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/Feed/Atom/Source.php b/library/Zend/Feed/Reader/Feed/Atom/Source.php
index e42f6940381..1731a4121ae 100644
--- a/library/Zend/Feed/Reader/Feed/Atom/Source.php
+++ b/library/Zend/Feed/Reader/Feed/Atom/Source.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader\Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Feed\Atom;
@@ -28,8 +26,6 @@
 /**
 * @category Zend
 * @package Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Source extends Feed\Atom
 {
diff --git a/library/Zend/Feed/Reader/Feed/FeedInterface.php b/library/Zend/Feed/Reader/Feed/FeedInterface.php
index dbc70c7de3f..30b7858bde9 100644
--- a/library/Zend/Feed/Reader/Feed/FeedInterface.php
+++ b/library/Zend/Feed/Reader/Feed/FeedInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Feed;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 interface FeedInterface extends Iterator, Countable
 {
diff --git a/library/Zend/Feed/Reader/Feed/Rss.php b/library/Zend/Feed/Reader/Feed/Rss.php
index be2036310b8..30944a18608 100644
--- a/library/Zend/Feed/Reader/Feed/Rss.php
+++ b/library/Zend/Feed/Reader/Feed/Rss.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader\Feed;
@@ -29,8 +27,6 @@
 /**
 * @category Zend
 * @package Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Rss extends AbstractFeed
 {
diff --git a/library/Zend/Feed/Reader/FeedSet.php b/library/Zend/Feed/Reader/FeedSet.php
index d0776d8b7c5..e4585423b11 100644
--- a/library/Zend/Feed/Reader/FeedSet.php
+++ b/library/Zend/Feed/Reader/FeedSet.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class FeedSet extends ArrayObject
 {
diff --git a/library/Zend/Feed/Reader/Reader.php b/library/Zend/Feed/Reader/Reader.php
index 516968833ff..413f0850365 100644
--- a/library/Zend/Feed/Reader/Reader.php
+++ b/library/Zend/Feed/Reader/Reader.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Reader;
@@ -30,8 +28,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Reader
 {
diff --git a/library/Zend/Feed/Writer/AbstractFeed.php b/library/Zend/Feed/Writer/AbstractFeed.php
index fab9b7bd919..c92c2ed74d2 100644
--- a/library/Zend/Feed/Writer/AbstractFeed.php
+++ b/library/Zend/Feed/Writer/AbstractFeed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer;
@@ -27,8 +25,6 @@
 /**
  * @category Zend
  * @package Zend_Feed_Writer
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
  */
 class AbstractFeed
 {
diff --git a/library/Zend/Feed/Writer/Deleted.php b/library/Zend/Feed/Writer/Deleted.php
index c16ea393fde..03ec47a6846 100644
--- a/library/Zend/Feed/Writer/Deleted.php
+++ b/library/Zend/Feed/Writer/Deleted.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Deleted
 {
diff --git a/library/Zend/Feed/Writer/Entry.php b/library/Zend/Feed/Writer/Entry.php
index 19369507efe..290135802c8 100644
--- a/library/Zend/Feed/Writer/Entry.php
+++ b/library/Zend/Feed/Writer/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry
 {
diff --git a/library/Zend/Feed/Writer/Exception/BadMethodCallException.php b/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
index a838552642c..8af4b9a1167 100644
--- a/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
+++ b/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Exception;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException
     extends Exception\BadMethodCallException
diff --git a/library/Zend/Feed/Writer/Exception/ExceptionInterface.php b/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
index ce480cfe66d..04213801de6 100644
--- a/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Feed
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace Zend\Feed\Writer\Exception;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Feed
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php b/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
index 09913ae7697..fc4bb4fcbc1 100644
--- a/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Feed
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Exception;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Feed
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException 
     extends Exception\InvalidArgumentException
diff --git a/library/Zend/Feed/Writer/Exception/RuntimeException.php b/library/Zend/Feed/Writer/Exception/RuntimeException.php
index f6efaf223e7..bc5ec84159a 100644
--- a/library/Zend/Feed/Writer/Exception/RuntimeException.php
+++ b/library/Zend/Feed/Writer/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Feed/Writer/Extension/AbstractRenderer.php b/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
index 88907a859de..003d2e09433 100644
--- a/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
+++ b/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer_Entry_Rss
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Extension;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer_Entry_Rss
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 abstract class AbstractRenderer implements Renderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
index 86e910b2dba..b4569664d56 100644
--- a/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\Atom\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
index 5dd5ccbc780..b1a2dc5a673 100644
--- a/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\Content\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
index fcb030008fe..67873fdd8d2 100644
--- a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
index 4c02f81b792..cac9f66295d 100644
--- a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Entry.php b/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
index 591772fcc66..b314b80057f 100644
--- a/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\ITunes;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry
 {
diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Feed.php b/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
index c57c9319eb4..c99e4227f0f 100644
--- a/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\ITunes;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed
 {
diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
index 4c2b860aed2..4df47e53e6b 100644
--- a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
index 63c2d643ccd..33f4a86ca39 100644
--- a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/Renderer.php b/library/Zend/Feed/Writer/Extension/Renderer.php
index 5de01266a06..3bef4d0dba5 100644
--- a/library/Zend/Feed/Writer/Extension/Renderer.php
+++ b/library/Zend/Feed/Writer/Extension/Renderer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Extension;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 interface Renderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
index 51594837d2e..e3636f8eb52 100644
--- a/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\Slash\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
index 36db2d9f308..e24706e38c8 100644
--- a/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\Threading\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index 25e99504951..9dd95433b45 100644
--- a/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Extension\WellFormedWeb\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Entry extends Extension\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Feed.php b/library/Zend/Feed/Writer/Feed.php
index 398cb8bac96..67a8860d433 100644
--- a/library/Zend/Feed/Writer/Feed.php
+++ b/library/Zend/Feed/Writer/Feed.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer;
@@ -28,8 +26,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Feed extends AbstractFeed implements Iterator, Countable
 {
diff --git a/library/Zend/Feed/Writer/FeedFactory.php b/library/Zend/Feed/Writer/FeedFactory.php
index 9425f42deda..1e22dbad962 100644
--- a/library/Zend/Feed/Writer/FeedFactory.php
+++ b/library/Zend/Feed/Writer/FeedFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Feed
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Feed
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd New BSD License
  */
 abstract class FeedFactory
 {
diff --git a/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php b/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
index 96d6e4b85dc..b884ebf9b09 100644
--- a/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
+++ b/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Renderer;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Atom.php b/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
index d5647cd1f0f..1d2d5530ad1 100644
--- a/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Entry;
@@ -31,8 +29,6 @@
 /**
  * @category Zend
  * @package Zend_Feed_Writer
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
  */
 class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php b/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
index da4a20bda4f..5b871a4bf6d 100644
--- a/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Entry\Atom;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Deleted
     extends \Zend\Feed\Writer\Renderer\AbstractRenderer
diff --git a/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php b/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
index a068e893ebc..0f0b8189d9e 100644
--- a/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Entry;
@@ -29,8 +27,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Rss.php b/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
index ff109adf21d..dc5909359f5 100644
--- a/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Entry;
@@ -30,8 +28,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php b/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
index 47a1a8eb562..3f24dba62f7 100644
--- a/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Feed;
@@ -29,8 +27,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class AbstractAtom extends Renderer\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
index 981b85cba9f..81f727cf09a 100644
--- a/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Feed;
@@ -27,8 +25,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Atom extends AbstractAtom implements Renderer\RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
index 44b2b894bed..699f5685f02 100644
--- a/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Feed\Atom;
@@ -28,8 +26,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
index 8958cd38c50..2fc76de3718 100644
--- a/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Feed\Atom;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Source extends AbstractAtom implements \Zend\Feed\Writer\Renderer\RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php b/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
index 99be090c059..e7cbc0a7eeb 100644
--- a/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
  
 namespace Zend\Feed\Writer\Renderer\Feed;
@@ -28,8 +26,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class AtomSource extends AbstractAtom implements Renderer\RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Rss.php b/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
index ab199cfed2b..a3fe083bae1 100644
--- a/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer\Feed;
@@ -30,8 +28,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Renderer/RendererInterface.php b/library/Zend/Feed/Writer/Renderer/RendererInterface.php
index 1d0f76c8691..9fe9c8120da 100644
--- a/library/Zend/Feed/Writer/Renderer/RendererInterface.php
+++ b/library/Zend/Feed/Writer/Renderer/RendererInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer\Renderer;
@@ -26,8 +24,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 interface RendererInterface
 {
diff --git a/library/Zend/Feed/Writer/Source.php b/library/Zend/Feed/Writer/Source.php
index 9b5d2032840..5d7bb631b68 100644
--- a/library/Zend/Feed/Writer/Source.php
+++ b/library/Zend/Feed/Writer/Source.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer;
@@ -23,8 +21,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Source extends AbstractFeed
 {
diff --git a/library/Zend/Feed/Writer/Writer.php b/library/Zend/Feed/Writer/Writer.php
index c6b8b0bac2c..47d2f31ce61 100644
--- a/library/Zend/Feed/Writer/Writer.php
+++ b/library/Zend/Feed/Writer/Writer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Feed\Writer;
@@ -28,8 +26,6 @@
 /**
 * @category Zend
 * @package Zend_Feed_Writer
-* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
 */
 class Writer
 {
diff --git a/library/Zend/File/ClassFileLocator.php b/library/Zend/File/ClassFileLocator.php
index 3c761b3f14a..4d3e3369683 100644
--- a/library/Zend/File/ClassFileLocator.php
+++ b/library/Zend/File/ClassFileLocator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_File
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_File
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClassFileLocator extends FilterIterator
 {
diff --git a/library/Zend/File/Exception/BadMethodCallException.php b/library/Zend/File/Exception/BadMethodCallException.php
index cfd7ef828ed..b0b8aac4582 100644
--- a/library/Zend/File/Exception/BadMethodCallException.php
+++ b/library/Zend/File/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/File/Exception/ExceptionInterface.php b/library/Zend/File/Exception/ExceptionInterface.php
index 03e4ed20ce1..9f0497268e6 100644
--- a/library/Zend/File/Exception/ExceptionInterface.php
+++ b/library/Zend/File/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_File
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Exception;
@@ -26,7 +24,6 @@
  * 
  * @package    Zend_File
  * @subpackage Exception
- * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/File/Exception/InvalidArgumentException.php b/library/Zend/File/Exception/InvalidArgumentException.php
index 7c982bdd9eb..dd1f6dc7d64 100644
--- a/library/Zend/File/Exception/InvalidArgumentException.php
+++ b/library/Zend/File/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_File
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Exception;
@@ -25,7 +23,6 @@
  * Exception class raised when invalid arguments are discovered
  * 
  * @package    Zend_File
- * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
  */
 class InvalidArgumentException 
     extends \InvalidArgumentException 
diff --git a/library/Zend/File/Exception/RuntimeException.php b/library/Zend/File/Exception/RuntimeException.php
index afce772899a..29cc2a78e3c 100644
--- a/library/Zend/File/Exception/RuntimeException.php
+++ b/library/Zend/File/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Exception;
@@ -23,10 +21,8 @@
 /**
  * @category   Zend
  * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
index 8cc9bedfc89..02ac1bad203 100644
--- a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
+++ b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer\Adapter;
@@ -40,8 +38,6 @@
  * @todo      Rewrite
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter
 {
diff --git a/library/Zend/File/Transfer/Adapter/Http.php b/library/Zend/File/Transfer/Adapter/Http.php
index 6e8ae7ed0cb..ea7df2a9a70 100644
--- a/library/Zend/File/Transfer/Adapter/Http.php
+++ b/library/Zend/File/Transfer/Adapter/Http.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer\Adapter;
@@ -30,8 +28,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Http extends AbstractAdapter
 {
diff --git a/library/Zend/File/Transfer/Exception/BadMethodCallException.php b/library/Zend/File/Transfer/Exception/BadMethodCallException.php
index b3321912a5d..1fcabe977cb 100644
--- a/library/Zend/File/Transfer/Exception/BadMethodCallException.php
+++ b/library/Zend/File/Transfer/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends Exception\BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/File/Transfer/Exception/ExceptionInterface.php b/library/Zend/File/Transfer/Exception/ExceptionInterface.php
index 84f464ffe27..d6e167a11ae 100644
--- a/library/Zend/File/Transfer/Exception/ExceptionInterface.php
+++ b/library/Zend/File/Transfer/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer\Exception;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
     extends FileException
diff --git a/library/Zend/File/Transfer/Exception/InvalidArgumentException.php b/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
index e2ef6b7df6e..f5f491b1089 100644
--- a/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
+++ b/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php b/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
index 0e010b1c12c..fa1deacc84c 100644
--- a/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
+++ b/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhpEnvironmentException extends RuntimeException
 {}
diff --git a/library/Zend/File/Transfer/Exception/RuntimeException.php b/library/Zend/File/Transfer/Exception/RuntimeException.php
index 0630abe19b7..2ed0e7af883 100644
--- a/library/Zend/File/Transfer/Exception/RuntimeException.php
+++ b/library/Zend/File/Transfer/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/File/Transfer/Transfer.php b/library/Zend/File/Transfer/Transfer.php
index 135c990e63e..37dce0fdbe6 100644
--- a/library/Zend/File/Transfer/Transfer.php
+++ b/library/Zend/File/Transfer/Transfer.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\File\Transfer;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Transfer
 {
diff --git a/library/Zend/Filter/AbstractFilter.php b/library/Zend/Filter/AbstractFilter.php
index 4bd120fb3e7..a7ab1d7aebd 100644
--- a/library/Zend/Filter/AbstractFilter.php
+++ b/library/Zend/Filter/AbstractFilter.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFilter implements FilterInterface
 {
diff --git a/library/Zend/Filter/AbstractUnicode.php b/library/Zend/Filter/AbstractUnicode.php
index 26ae581c62d..9e65d9e35d9 100644
--- a/library/Zend/Filter/AbstractUnicode.php
+++ b/library/Zend/Filter/AbstractUnicode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractUnicode extends AbstractFilter
 {
diff --git a/library/Zend/Filter/BaseName.php b/library/Zend/Filter/BaseName.php
index 0b1b0ae5815..c34b5553796 100644
--- a/library/Zend/Filter/BaseName.php
+++ b/library/Zend/Filter/BaseName.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BaseName extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Boolean.php b/library/Zend/Filter/Boolean.php
index 85b2c8cc71d..cc72f63e10d 100644
--- a/library/Zend/Filter/Boolean.php
+++ b/library/Zend/Filter/Boolean.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Boolean extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Callback.php b/library/Zend/Filter/Callback.php
index 52ba4806090..213d9d083f8 100644
--- a/library/Zend/Filter/Callback.php
+++ b/library/Zend/Filter/Callback.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Callback extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Compress.php b/library/Zend/Filter/Compress.php
index 3e75e5d39ac..59d92fa5841 100644
--- a/library/Zend/Filter/Compress.php
+++ b/library/Zend/Filter/Compress.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Compress extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php b/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
index 1b0d7c8a77c..b426782d90b 100644
--- a/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
+++ b/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCompressionAlgorithm implements CompressionAlgorithmInterface
 {
diff --git a/library/Zend/Filter/Compress/Bz2.php b/library/Zend/Filter/Compress/Bz2.php
index 6815bb7631b..fdee8c54081 100644
--- a/library/Zend/Filter/Compress/Bz2.php
+++ b/library/Zend/Filter/Compress/Bz2.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Bz2 extends AbstractCompressionAlgorithm
 {
diff --git a/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php b/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
index e25ce351a72..0141df1579b 100644
--- a/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
+++ b/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface CompressionAlgorithmInterface
 {
diff --git a/library/Zend/Filter/Compress/Gz.php b/library/Zend/Filter/Compress/Gz.php
index 1eb6388ef6f..a116c69c68f 100644
--- a/library/Zend/Filter/Compress/Gz.php
+++ b/library/Zend/Filter/Compress/Gz.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Gz extends AbstractCompressionAlgorithm
 {
diff --git a/library/Zend/Filter/Compress/Lzf.php b/library/Zend/Filter/Compress/Lzf.php
index 986c1c1fe0c..84cac578413 100644
--- a/library/Zend/Filter/Compress/Lzf.php
+++ b/library/Zend/Filter/Compress/Lzf.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Lzf implements CompressionAlgorithmInterface
 {
diff --git a/library/Zend/Filter/Compress/Rar.php b/library/Zend/Filter/Compress/Rar.php
index 69f927d9e69..6f4892f94f4 100644
--- a/library/Zend/Filter/Compress/Rar.php
+++ b/library/Zend/Filter/Compress/Rar.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rar extends AbstractCompressionAlgorithm
 {
diff --git a/library/Zend/Filter/Compress/Tar.php b/library/Zend/Filter/Compress/Tar.php
index c4563a206c3..50971bffff5 100644
--- a/library/Zend/Filter/Compress/Tar.php
+++ b/library/Zend/Filter/Compress/Tar.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Tar extends AbstractCompressionAlgorithm
 {
diff --git a/library/Zend/Filter/Compress/Zip.php b/library/Zend/Filter/Compress/Zip.php
index bf06190ed94..98717925711 100644
--- a/library/Zend/Filter/Compress/Zip.php
+++ b/library/Zend/Filter/Compress/Zip.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Compress;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zip extends AbstractCompressionAlgorithm
 {
diff --git a/library/Zend/Filter/Decompress.php b/library/Zend/Filter/Decompress.php
index c4f9d68f6e8..4d64071ee7d 100644
--- a/library/Zend/Filter/Decompress.php
+++ b/library/Zend/Filter/Decompress.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Decompress extends Compress
 {
diff --git a/library/Zend/Filter/Decrypt.php b/library/Zend/Filter/Decrypt.php
index 8c77fa1d0bf..dbe9d509955 100644
--- a/library/Zend/Filter/Decrypt.php
+++ b/library/Zend/Filter/Decrypt.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Decrypt extends Encrypt
 {
diff --git a/library/Zend/Filter/Digits.php b/library/Zend/Filter/Digits.php
index 1b7e589223b..cf49d24da0e 100644
--- a/library/Zend/Filter/Digits.php
+++ b/library/Zend/Filter/Digits.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Digits extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Dir.php b/library/Zend/Filter/Dir.php
index fe07afd6f74..89eccef00fe 100644
--- a/library/Zend/Filter/Dir.php
+++ b/library/Zend/Filter/Dir.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Dir extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Encrypt.php b/library/Zend/Filter/Encrypt.php
index f403cfb0a29..f54af06822d 100644
--- a/library/Zend/Filter/Encrypt.php
+++ b/library/Zend/Filter/Encrypt.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Encrypt extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php b/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
index aa91f4cf1fa..2e547e50139 100644
--- a/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
+++ b/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Encrypt;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface EncryptionAlgorithmInterface
 {
diff --git a/library/Zend/Filter/Encrypt/Mcrypt.php b/library/Zend/Filter/Encrypt/Mcrypt.php
index 1f594c874a9..a091ea70276 100644
--- a/library/Zend/Filter/Encrypt/Mcrypt.php
+++ b/library/Zend/Filter/Encrypt/Mcrypt.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Encrypt;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mcrypt implements EncryptionAlgorithmInterface
 {
diff --git a/library/Zend/Filter/Encrypt/Openssl.php b/library/Zend/Filter/Encrypt/Openssl.php
index e8363d69280..bd00b421a3b 100644
--- a/library/Zend/Filter/Encrypt/Openssl.php
+++ b/library/Zend/Filter/Encrypt/Openssl.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Encrypt;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Openssl implements EncryptionAlgorithmInterface
 {
diff --git a/library/Zend/Filter/Exception/DomainException.php b/library/Zend/Filter/Exception/DomainException.php
index f5f778e3f2e..07fedc08b85 100644
--- a/library/Zend/Filter/Exception/DomainException.php
+++ b/library/Zend/Filter/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {
diff --git a/library/Zend/Filter/Exception/ExceptionInterface.php b/library/Zend/Filter/Exception/ExceptionInterface.php
index 29828c32830..f7809df864e 100644
--- a/library/Zend/Filter/Exception/ExceptionInterface.php
+++ b/library/Zend/Filter/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Filter/File/Decrypt.php b/library/Zend/Filter/File/Decrypt.php
index f19b25c993b..fce7f5535c9 100644
--- a/library/Zend/Filter/File/Decrypt.php
+++ b/library/Zend/Filter/File/Decrypt.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\File;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Decrypt extends Filter\Decrypt
 {
diff --git a/library/Zend/Filter/File/Encrypt.php b/library/Zend/Filter/File/Encrypt.php
index 37aae14a3bc..b96c37da5a2 100644
--- a/library/Zend/Filter/File/Encrypt.php
+++ b/library/Zend/Filter/File/Encrypt.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\File;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Encrypt extends Filter\Encrypt
 {
diff --git a/library/Zend/Filter/File/LowerCase.php b/library/Zend/Filter/File/LowerCase.php
index ccc75aaa04d..5d56d090259 100644
--- a/library/Zend/Filter/File/LowerCase.php
+++ b/library/Zend/Filter/File/LowerCase.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\File;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LowerCase extends StringToLower
 {
diff --git a/library/Zend/Filter/File/Rename.php b/library/Zend/Filter/File/Rename.php
index 073e1bff207..85f282338d5 100644
--- a/library/Zend/Filter/File/Rename.php
+++ b/library/Zend/Filter/File/Rename.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\File;
@@ -28,8 +26,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rename extends Filter\AbstractFilter
 {
diff --git a/library/Zend/Filter/File/UpperCase.php b/library/Zend/Filter/File/UpperCase.php
index ccb5bc40ac6..38d8db48ab9 100644
--- a/library/Zend/Filter/File/UpperCase.php
+++ b/library/Zend/Filter/File/UpperCase.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\File;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UpperCase extends StringToUpper
 {
diff --git a/library/Zend/Filter/FilterChain.php b/library/Zend/Filter/FilterChain.php
index 058b0076e99..00e3edf3e0e 100644
--- a/library/Zend/Filter/FilterChain.php
+++ b/library/Zend/Filter/FilterChain.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilterChain extends AbstractFilter implements Countable
 {
diff --git a/library/Zend/Filter/FilterInterface.php b/library/Zend/Filter/FilterInterface.php
index 939f29fb7fc..f6ad2e3e92e 100644
--- a/library/Zend/Filter/FilterInterface.php
+++ b/library/Zend/Filter/FilterInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FilterInterface
 {
diff --git a/library/Zend/Filter/FilterPluginManager.php b/library/Zend/Filter/FilterPluginManager.php
index 64108b59473..ba57bdbb1b5 100644
--- a/library/Zend/Filter/FilterPluginManager.php
+++ b/library/Zend/Filter/FilterPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilterPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Filter/HtmlEntities.php b/library/Zend/Filter/HtmlEntities.php
index 8ca8a31584c..06c8b2e9a32 100644
--- a/library/Zend/Filter/HtmlEntities.php
+++ b/library/Zend/Filter/HtmlEntities.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlEntities extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Inflector.php b/library/Zend/Filter/Inflector.php
index c1c68934550..ac6b2e7c9a4 100644
--- a/library/Zend/Filter/Inflector.php
+++ b/library/Zend/Filter/Inflector.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Inflector extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Int.php b/library/Zend/Filter/Int.php
index c02d8b7551d..186fd5c235c 100644
--- a/library/Zend/Filter/Int.php
+++ b/library/Zend/Filter/Int.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Int extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Null.php b/library/Zend/Filter/Null.php
index 405f9fa4c39..fc9c9e13643 100644
--- a/library/Zend/Filter/Null.php
+++ b/library/Zend/Filter/Null.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License;
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Null extends AbstractFilter
 {
diff --git a/library/Zend/Filter/PregReplace.php b/library/Zend/Filter/PregReplace.php
index d5d884dc61b..d9e4b2adf3a 100644
--- a/library/Zend/Filter/PregReplace.php
+++ b/library/Zend/Filter/PregReplace.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PregReplace extends AbstractFilter
 {
diff --git a/library/Zend/Filter/RealPath.php b/library/Zend/Filter/RealPath.php
index cca2a73ea85..04f51632f37 100644
--- a/library/Zend/Filter/RealPath.php
+++ b/library/Zend/Filter/RealPath.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RealPath extends AbstractFilter
 {
diff --git a/library/Zend/Filter/StaticFilter.php b/library/Zend/Filter/StaticFilter.php
index decd71b3845..a41df0ba51d 100644
--- a/library/Zend/Filter/StaticFilter.php
+++ b/library/Zend/Filter/StaticFilter.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StaticFilter
 {
diff --git a/library/Zend/Filter/StringToLower.php b/library/Zend/Filter/StringToLower.php
index c134c24f66c..0e6289de119 100644
--- a/library/Zend/Filter/StringToLower.php
+++ b/library/Zend/Filter/StringToLower.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StringToLower extends AbstractUnicode
 {
diff --git a/library/Zend/Filter/StringToUpper.php b/library/Zend/Filter/StringToUpper.php
index f5237c9f864..1a99868b6a0 100644
--- a/library/Zend/Filter/StringToUpper.php
+++ b/library/Zend/Filter/StringToUpper.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StringToUpper extends AbstractUnicode
 {
diff --git a/library/Zend/Filter/StringTrim.php b/library/Zend/Filter/StringTrim.php
index d42f226ff0a..b22be8b0d34 100644
--- a/library/Zend/Filter/StringTrim.php
+++ b/library/Zend/Filter/StringTrim.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StringTrim extends AbstractFilter
 {
diff --git a/library/Zend/Filter/StripNewlines.php b/library/Zend/Filter/StripNewlines.php
index 4a343e82739..13e90b1b751 100644
--- a/library/Zend/Filter/StripNewlines.php
+++ b/library/Zend/Filter/StripNewlines.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StripNewlines extends AbstractFilter
 {
diff --git a/library/Zend/Filter/StripTags.php b/library/Zend/Filter/StripTags.php
index 1fae0cc3fa4..f0297f37011 100644
--- a/library/Zend/Filter/StripTags.php
+++ b/library/Zend/Filter/StripTags.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StripTags extends AbstractFilter
 {
diff --git a/library/Zend/Filter/Word/AbstractSeparator.php b/library/Zend/Filter/Word/AbstractSeparator.php
index 015338bceb1..09b5c6919b6 100644
--- a/library/Zend/Filter/Word/AbstractSeparator.php
+++ b/library/Zend/Filter/Word/AbstractSeparator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractSeparator extends PregReplaceFilter
 {
diff --git a/library/Zend/Filter/Word/CamelCaseToDash.php b/library/Zend/Filter/Word/CamelCaseToDash.php
index d43f0183129..abf892e7635 100644
--- a/library/Zend/Filter/Word/CamelCaseToDash.php
+++ b/library/Zend/Filter/Word/CamelCaseToDash.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CamelCaseToDash extends CamelCaseToSeparator
 {
diff --git a/library/Zend/Filter/Word/CamelCaseToSeparator.php b/library/Zend/Filter/Word/CamelCaseToSeparator.php
index 0231eda7a4b..357d53e6773 100644
--- a/library/Zend/Filter/Word/CamelCaseToSeparator.php
+++ b/library/Zend/Filter/Word/CamelCaseToSeparator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CamelCaseToSeparator extends AbstractSeparator
 {
diff --git a/library/Zend/Filter/Word/CamelCaseToUnderscore.php b/library/Zend/Filter/Word/CamelCaseToUnderscore.php
index 81608a41196..e4156754301 100644
--- a/library/Zend/Filter/Word/CamelCaseToUnderscore.php
+++ b/library/Zend/Filter/Word/CamelCaseToUnderscore.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CamelCaseToUnderscore extends CamelCaseToSeparator
 {
diff --git a/library/Zend/Filter/Word/DashToCamelCase.php b/library/Zend/Filter/Word/DashToCamelCase.php
index 2abce5b3b10..b11b636053a 100644
--- a/library/Zend/Filter/Word/DashToCamelCase.php
+++ b/library/Zend/Filter/Word/DashToCamelCase.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DashToCamelCase extends SeparatorToCamelCase
 {
diff --git a/library/Zend/Filter/Word/DashToSeparator.php b/library/Zend/Filter/Word/DashToSeparator.php
index 2af192ad300..aebd358180a 100644
--- a/library/Zend/Filter/Word/DashToSeparator.php
+++ b/library/Zend/Filter/Word/DashToSeparator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DashToSeparator extends AbstractSeparator
 {
diff --git a/library/Zend/Filter/Word/DashToUnderscore.php b/library/Zend/Filter/Word/DashToUnderscore.php
index ee4ffccaa7d..f3b85d7a02d 100644
--- a/library/Zend/Filter/Word/DashToUnderscore.php
+++ b/library/Zend/Filter/Word/DashToUnderscore.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DashToUnderscore extends SeparatorToSeparator
 {
diff --git a/library/Zend/Filter/Word/SeparatorToCamelCase.php b/library/Zend/Filter/Word/SeparatorToCamelCase.php
index 4c62405eb88..a191be0dab3 100644
--- a/library/Zend/Filter/Word/SeparatorToCamelCase.php
+++ b/library/Zend/Filter/Word/SeparatorToCamelCase.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SeparatorToCamelCase extends AbstractSeparator
 {
diff --git a/library/Zend/Filter/Word/SeparatorToDash.php b/library/Zend/Filter/Word/SeparatorToDash.php
index a59cf3554db..520fe8d3075 100644
--- a/library/Zend/Filter/Word/SeparatorToDash.php
+++ b/library/Zend/Filter/Word/SeparatorToDash.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SeparatorToDash extends SeparatorToSeparator
 {
diff --git a/library/Zend/Filter/Word/SeparatorToSeparator.php b/library/Zend/Filter/Word/SeparatorToSeparator.php
index aa9ce25df2a..8650d2fd030 100644
--- a/library/Zend/Filter/Word/SeparatorToSeparator.php
+++ b/library/Zend/Filter/Word/SeparatorToSeparator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SeparatorToSeparator extends \Zend\Filter\PregReplace
 {
diff --git a/library/Zend/Filter/Word/UnderscoreToCamelCase.php b/library/Zend/Filter/Word/UnderscoreToCamelCase.php
index 9bda91d057a..86bb4bdacd8 100644
--- a/library/Zend/Filter/Word/UnderscoreToCamelCase.php
+++ b/library/Zend/Filter/Word/UnderscoreToCamelCase.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnderscoreToCamelCase extends SeparatorToCamelCase
 {
diff --git a/library/Zend/Filter/Word/UnderscoreToDash.php b/library/Zend/Filter/Word/UnderscoreToDash.php
index 24a4504ad84..46afcf1d6ab 100644
--- a/library/Zend/Filter/Word/UnderscoreToDash.php
+++ b/library/Zend/Filter/Word/UnderscoreToDash.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnderscoreToDash extends SeparatorToSeparator
 {
diff --git a/library/Zend/Filter/Word/UnderscoreToSeparator.php b/library/Zend/Filter/Word/UnderscoreToSeparator.php
index c302d19f632..f4133e380a0 100644
--- a/library/Zend/Filter/Word/UnderscoreToSeparator.php
+++ b/library/Zend/Filter/Word/UnderscoreToSeparator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Filter\Word;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnderscoreToSeparator extends SeparatorToSeparator
 {
diff --git a/library/Zend/Form/Annotation/AbstractAnnotationsListener.php b/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
index 3ea82a407ab..fa2db6e2b13 100644
--- a/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
+++ b/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -38,8 +36,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAnnotationsListener implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Form/Annotation/AbstractArrayAnnotation.php b/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
index 34a468ab0e8..4d15c195bdb 100644
--- a/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
+++ b/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractArrayAnnotation
 {
diff --git a/library/Zend/Form/Annotation/AbstractStringAnnotation.php b/library/Zend/Form/Annotation/AbstractStringAnnotation.php
index 4a586ea3bc4..64a82a59353 100644
--- a/library/Zend/Form/Annotation/AbstractStringAnnotation.php
+++ b/library/Zend/Form/Annotation/AbstractStringAnnotation.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/AllowEmpty.php b/library/Zend/Form/Annotation/AllowEmpty.php
index 11897988f24..2ccd3a27fdf 100644
--- a/library/Zend/Form/Annotation/AllowEmpty.php
+++ b/library/Zend/Form/Annotation/AllowEmpty.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -30,8 +28,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AllowEmpty
 {
diff --git a/library/Zend/Form/Annotation/AnnotationBuilder.php b/library/Zend/Form/Annotation/AnnotationBuilder.php
index b294d022a41..a0df253950c 100644
--- a/library/Zend/Form/Annotation/AnnotationBuilder.php
+++ b/library/Zend/Form/Annotation/AnnotationBuilder.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -41,8 +39,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AnnotationBuilder implements EventManagerAwareInterface
 {
diff --git a/library/Zend/Form/Annotation/Attributes.php b/library/Zend/Form/Annotation/Attributes.php
index 950fb689606..9dc6b2a83be 100644
--- a/library/Zend/Form/Annotation/Attributes.php
+++ b/library/Zend/Form/Annotation/Attributes.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -30,8 +28,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Attributes extends AbstractArrayAnnotation
 {
diff --git a/library/Zend/Form/Annotation/ComposedObject.php b/library/Zend/Form/Annotation/ComposedObject.php
index 3e2c635efbf..b27f21f59f4 100644
--- a/library/Zend/Form/Annotation/ComposedObject.php
+++ b/library/Zend/Form/Annotation/ComposedObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -32,8 +30,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ComposedObject extends AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/ElementAnnotationsListener.php b/library/Zend/Form/Annotation/ElementAnnotationsListener.php
index 87f8800b8ec..c242f6e3a25 100644
--- a/library/Zend/Form/Annotation/ElementAnnotationsListener.php
+++ b/library/Zend/Form/Annotation/ElementAnnotationsListener.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -46,8 +44,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ElementAnnotationsListener extends AbstractAnnotationsListener
 {
diff --git a/library/Zend/Form/Annotation/ErrorMessage.php b/library/Zend/Form/Annotation/ErrorMessage.php
index 1b6ce3f1e94..d8efd244bf5 100644
--- a/library/Zend/Form/Annotation/ErrorMessage.php
+++ b/library/Zend/Form/Annotation/ErrorMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -30,8 +28,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorMessage extends AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/Exclude.php b/library/Zend/Form/Annotation/Exclude.php
index e65f9637a34..a7a0a8ae7b8 100644
--- a/library/Zend/Form/Annotation/Exclude.php
+++ b/library/Zend/Form/Annotation/Exclude.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Exclude
 {
diff --git a/library/Zend/Form/Annotation/Filter.php b/library/Zend/Form/Annotation/Filter.php
index 8dd58d83665..e3b90cbb9b9 100644
--- a/library/Zend/Form/Annotation/Filter.php
+++ b/library/Zend/Form/Annotation/Filter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -35,8 +33,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Filter extends AbstractArrayAnnotation
 {
diff --git a/library/Zend/Form/Annotation/Flags.php b/library/Zend/Form/Annotation/Flags.php
index 2a4523b5726..68783ae7f37 100644
--- a/library/Zend/Form/Annotation/Flags.php
+++ b/library/Zend/Form/Annotation/Flags.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -33,8 +31,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Flags extends AbstractArrayAnnotation
 {
diff --git a/library/Zend/Form/Annotation/FormAnnotationsListener.php b/library/Zend/Form/Annotation/FormAnnotationsListener.php
index 6d629fdb475..754c70dec39 100644
--- a/library/Zend/Form/Annotation/FormAnnotationsListener.php
+++ b/library/Zend/Form/Annotation/FormAnnotationsListener.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -42,8 +40,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormAnnotationsListener extends AbstractAnnotationsListener
 {
diff --git a/library/Zend/Form/Annotation/Hydrator.php b/library/Zend/Form/Annotation/Hydrator.php
index 7e3ceb109be..e6f32e32aab 100644
--- a/library/Zend/Form/Annotation/Hydrator.php
+++ b/library/Zend/Form/Annotation/Hydrator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -31,8 +29,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hydrator extends AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/Input.php b/library/Zend/Form/Annotation/Input.php
index d3c09c393dc..7b631a72a4c 100644
--- a/library/Zend/Form/Annotation/Input.php
+++ b/library/Zend/Form/Annotation/Input.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -31,8 +29,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Input extends AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/InputFilter.php b/library/Zend/Form/Annotation/InputFilter.php
index 3fd4d825c02..e8ed782c837 100644
--- a/library/Zend/Form/Annotation/InputFilter.php
+++ b/library/Zend/Form/Annotation/InputFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -31,8 +29,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InputFilter extends AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/Name.php b/library/Zend/Form/Annotation/Name.php
index cd983d99a87..ec965d80da4 100644
--- a/library/Zend/Form/Annotation/Name.php
+++ b/library/Zend/Form/Annotation/Name.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -30,8 +28,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Name extends AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/Options.php b/library/Zend/Form/Annotation/Options.php
index 1df42cd14eb..64c8aad3464 100644
--- a/library/Zend/Form/Annotation/Options.php
+++ b/library/Zend/Form/Annotation/Options.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -32,8 +30,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Options extends AbstractArrayAnnotation
 {
diff --git a/library/Zend/Form/Annotation/Required.php b/library/Zend/Form/Annotation/Required.php
index ee9ffb3539e..48a673b3abc 100644
--- a/library/Zend/Form/Annotation/Required.php
+++ b/library/Zend/Form/Annotation/Required.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -34,8 +32,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Required
 {
diff --git a/library/Zend/Form/Annotation/Type.php b/library/Zend/Form/Annotation/Type.php
index 44cfa51bfba..a75b98bdee3 100644
--- a/library/Zend/Form/Annotation/Type.php
+++ b/library/Zend/Form/Annotation/Type.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -31,8 +29,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Type extends AbstractStringAnnotation
 {
diff --git a/library/Zend/Form/Annotation/Validator.php b/library/Zend/Form/Annotation/Validator.php
index 7fddf817e14..b3407f295c6 100644
--- a/library/Zend/Form/Annotation/Validator.php
+++ b/library/Zend/Form/Annotation/Validator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Annotation;
@@ -37,8 +35,6 @@
  * @Annotation
  * @package    Zend_Form
  * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Validator extends AbstractArrayAnnotation
 {
diff --git a/library/Zend/Form/Element.php b/library/Zend/Form/Element.php
index aa86f1946b9..60d86b11bbb 100644
--- a/library/Zend/Form/Element.php
+++ b/library/Zend/Form/Element.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Element implements ElementInterface
 {
diff --git a/library/Zend/Form/Element/Captcha.php b/library/Zend/Form/Element/Captcha.php
index 55850f4f030..f3e6596f35c 100644
--- a/library/Zend/Form/Element/Captcha.php
+++ b/library/Zend/Form/Element/Captcha.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Captcha extends Element implements InputProviderInterface
 {
diff --git a/library/Zend/Form/Element/Collection.php b/library/Zend/Form/Element/Collection.php
index dcd10c6fe8e..4e97d129af4 100644
--- a/library/Zend/Form/Element/Collection.php
+++ b/library/Zend/Form/Element/Collection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Collection extends Fieldset
 {
diff --git a/library/Zend/Form/Element/Color.php b/library/Zend/Form/Element/Color.php
index f5da7825a2c..b1550a4c756 100644
--- a/library/Zend/Form/Element/Color.php
+++ b/library/Zend/Form/Element/Color.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Color extends Element implements InputProviderInterface
 {
diff --git a/library/Zend/Form/Element/Csrf.php b/library/Zend/Form/Element/Csrf.php
index a4fc3332ced..bb2d25e962e 100644
--- a/library/Zend/Form/Element/Csrf.php
+++ b/library/Zend/Form/Element/Csrf.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Csrf extends Element implements InputProviderInterface, ElementPrepareAwareInterface
 {
diff --git a/library/Zend/Form/Element/Date.php b/library/Zend/Form/Element/Date.php
index c28b4491def..3ecd2a13999 100644
--- a/library/Zend/Form/Element/Date.php
+++ b/library/Zend/Form/Element/Date.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Date extends DateTime
 {
diff --git a/library/Zend/Form/Element/DateTime.php b/library/Zend/Form/Element/DateTime.php
index e27f3062026..659d63b9ae5 100644
--- a/library/Zend/Form/Element/DateTime.php
+++ b/library/Zend/Form/Element/DateTime.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DateTime extends Element implements InputProviderInterface
 {
diff --git a/library/Zend/Form/Element/DateTimeLocal.php b/library/Zend/Form/Element/DateTimeLocal.php
index 01719a676e6..fd33a2047a1 100644
--- a/library/Zend/Form/Element/DateTimeLocal.php
+++ b/library/Zend/Form/Element/DateTimeLocal.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DateTimeLocal extends DateTime
 {
diff --git a/library/Zend/Form/Element/Email.php b/library/Zend/Form/Element/Email.php
index 7fa75945904..febd51c3c3b 100644
--- a/library/Zend/Form/Element/Email.php
+++ b/library/Zend/Form/Element/Email.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Email extends Element implements InputProviderInterface
 {
diff --git a/library/Zend/Form/Element/Month.php b/library/Zend/Form/Element/Month.php
index 36b34021d75..4e1f500b366 100644
--- a/library/Zend/Form/Element/Month.php
+++ b/library/Zend/Form/Element/Month.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Month extends DateTime
 {
diff --git a/library/Zend/Form/Element/MultiCheckbox.php b/library/Zend/Form/Element/MultiCheckbox.php
index a70d8fc76dc..c3e5fadc557 100644
--- a/library/Zend/Form/Element/MultiCheckbox.php
+++ b/library/Zend/Form/Element/MultiCheckbox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MultiCheckbox extends Element implements InputProviderInterface
 {
diff --git a/library/Zend/Form/Element/Number.php b/library/Zend/Form/Element/Number.php
index cea1b5b05d8..4343793492a 100644
--- a/library/Zend/Form/Element/Number.php
+++ b/library/Zend/Form/Element/Number.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Number extends Element implements InputProviderInterface
 {
diff --git a/library/Zend/Form/Element/Radio.php b/library/Zend/Form/Element/Radio.php
index 3b10ccc7bb7..c8e6d287225 100644
--- a/library/Zend/Form/Element/Radio.php
+++ b/library/Zend/Form/Element/Radio.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Radio extends MultiCheckbox
 {
diff --git a/library/Zend/Form/Element/Range.php b/library/Zend/Form/Element/Range.php
index 3701b722fce..d6d76931114 100644
--- a/library/Zend/Form/Element/Range.php
+++ b/library/Zend/Form/Element/Range.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Range extends NumberElement
 {
diff --git a/library/Zend/Form/Element/Time.php b/library/Zend/Form/Element/Time.php
index 90319528d8c..ddf49733009 100644
--- a/library/Zend/Form/Element/Time.php
+++ b/library/Zend/Form/Element/Time.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Time extends DateTime
 {
diff --git a/library/Zend/Form/Element/Url.php b/library/Zend/Form/Element/Url.php
index efa9ac8e77f..a5d332a61d4 100644
--- a/library/Zend/Form/Element/Url.php
+++ b/library/Zend/Form/Element/Url.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Url extends Element implements InputProviderInterface
 {
diff --git a/library/Zend/Form/Element/Week.php b/library/Zend/Form/Element/Week.php
index 0301dec772d..373b70ab6b1 100644
--- a/library/Zend/Form/Element/Week.php
+++ b/library/Zend/Form/Element/Week.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Element;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Week extends DateTime
 {
diff --git a/library/Zend/Form/ElementInterface.php b/library/Zend/Form/ElementInterface.php
index 684b8f6ceba..2661294ae03 100644
--- a/library/Zend/Form/ElementInterface.php
+++ b/library/Zend/Form/ElementInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ElementInterface
 {
diff --git a/library/Zend/Form/ElementPrepareAwareInterface.php b/library/Zend/Form/ElementPrepareAwareInterface.php
index 9b6f20eb40c..33007a2bdc7 100644
--- a/library/Zend/Form/ElementPrepareAwareInterface.php
+++ b/library/Zend/Form/ElementPrepareAwareInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend\Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ElementPrepareAwareInterface
 {
diff --git a/library/Zend/Form/Exception/BadMethodCallException.php b/library/Zend/Form/Exception/BadMethodCallException.php
index 27c82a99c1e..f361daba42f 100644
--- a/library/Zend/Form/Exception/BadMethodCallException.php
+++ b/library/Zend/Form/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException 
     extends \BadMethodCallException
diff --git a/library/Zend/Form/Exception/DomainException.php b/library/Zend/Form/Exception/DomainException.php
index 1235853890b..7f18c41383a 100644
--- a/library/Zend/Form/Exception/DomainException.php
+++ b/library/Zend/Form/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements 
     ExceptionInterface
diff --git a/library/Zend/Form/Exception/ExceptionInterface.php b/library/Zend/Form/Exception/ExceptionInterface.php
index a552e4d218f..ec3bf67c448 100644
--- a/library/Zend/Form/Exception/ExceptionInterface.php
+++ b/library/Zend/Form/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Form/Exception/InvalidArgumentException.php b/library/Zend/Form/Exception/InvalidArgumentException.php
index 181f5d4cf87..634dd6bfc8c 100644
--- a/library/Zend/Form/Exception/InvalidArgumentException.php
+++ b/library/Zend/Form/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Form/Exception/UnexpectedValueException.php b/library/Zend/Form/Exception/UnexpectedValueException.php
index 165f18ccf6a..b2bdc31c93b 100644
--- a/library/Zend/Form/Exception/UnexpectedValueException.php
+++ b/library/Zend/Form/Exception/UnexpectedValueException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends \UnexpectedValueException implements 
     ExceptionInterface
diff --git a/library/Zend/Form/Factory.php b/library/Zend/Form/Factory.php
index 0213a522e96..5ab93864890 100644
--- a/library/Zend/Form/Factory.php
+++ b/library/Zend/Form/Factory.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -31,8 +29,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Factory
 {
diff --git a/library/Zend/Form/Fieldset.php b/library/Zend/Form/Fieldset.php
index 8760086e168..c3215c22718 100644
--- a/library/Zend/Form/Fieldset.php
+++ b/library/Zend/Form/Fieldset.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Fieldset extends Element implements FieldsetInterface
 {
diff --git a/library/Zend/Form/FieldsetInterface.php b/library/Zend/Form/FieldsetInterface.php
index a2a36985b42..55283bb7640 100644
--- a/library/Zend/Form/FieldsetInterface.php
+++ b/library/Zend/Form/FieldsetInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FieldsetInterface extends
     Countable,
diff --git a/library/Zend/Form/Form.php b/library/Zend/Form/Form.php
index 9a1b46a4adc..15c4966f33a 100644
--- a/library/Zend/Form/Form.php
+++ b/library/Zend/Form/Form.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -35,8 +33,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Form extends Fieldset implements FormInterface
 {
diff --git a/library/Zend/Form/FormFactoryAwareInterface.php b/library/Zend/Form/FormFactoryAwareInterface.php
index fbbdaf84b2d..d8de7b1c0fb 100644
--- a/library/Zend/Form/FormFactoryAwareInterface.php
+++ b/library/Zend/Form/FormFactoryAwareInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FormFactoryAwareInterface
 {
diff --git a/library/Zend/Form/FormInterface.php b/library/Zend/Form/FormInterface.php
index c6ee766ffdb..4b680f27112 100644
--- a/library/Zend/Form/FormInterface.php
+++ b/library/Zend/Form/FormInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FormInterface extends FieldsetInterface
 {
diff --git a/library/Zend/Form/View/Helper/AbstractHelper.php b/library/Zend/Form/View/Helper/AbstractHelper.php
index f66c0eee71a..811ce0998c1 100644
--- a/library/Zend/Form/View/Helper/AbstractHelper.php
+++ b/library/Zend/Form/View/Helper/AbstractHelper.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractHelper extends BaseAbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/Captcha/AbstractWord.php b/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
index b4a51228a19..5626318b732 100644
--- a/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
+++ b/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper\Captcha;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractWord extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/Captcha/Dumb.php b/library/Zend/Form/View/Helper/Captcha/Dumb.php
index 3a7aac29660..b5ddb97dbfd 100644
--- a/library/Zend/Form/View/Helper/Captcha/Dumb.php
+++ b/library/Zend/Form/View/Helper/Captcha/Dumb.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper\Captcha;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Dumb extends AbstractWord
 {
diff --git a/library/Zend/Form/View/Helper/Captcha/Figlet.php b/library/Zend/Form/View/Helper/Captcha/Figlet.php
index 0547cb327ec..7f95bb32627 100644
--- a/library/Zend/Form/View/Helper/Captcha/Figlet.php
+++ b/library/Zend/Form/View/Helper/Captcha/Figlet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper\Captcha;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Figlet extends AbstractWord
 {
diff --git a/library/Zend/Form/View/Helper/Captcha/Image.php b/library/Zend/Form/View/Helper/Captcha/Image.php
index 3a4f576ffe2..b57dcf267c4 100644
--- a/library/Zend/Form/View/Helper/Captcha/Image.php
+++ b/library/Zend/Form/View/Helper/Captcha/Image.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper\Captcha;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Image extends AbstractWord
 {
diff --git a/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php b/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
index e912b079452..5b840093c9d 100644
--- a/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
+++ b/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper\Captcha;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReCaptcha extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/Form.php b/library/Zend/Form/View/Helper/Form.php
index 47cc1ba5465..23cf21a15c3 100644
--- a/library/Zend/Form/View/Helper/Form.php
+++ b/library/Zend/Form/View/Helper/Form.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Form extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormButton.php b/library/Zend/Form/View/Helper/FormButton.php
index 25a23889206..81ff8581a90 100644
--- a/library/Zend/Form/View/Helper/FormButton.php
+++ b/library/Zend/Form/View/Helper/FormButton.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormButton extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormCaptcha.php b/library/Zend/Form/View/Helper/FormCaptcha.php
index 39adaa577f6..50ee78fc883 100644
--- a/library/Zend/Form/View/Helper/FormCaptcha.php
+++ b/library/Zend/Form/View/Helper/FormCaptcha.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormCaptcha extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormCheckbox.php b/library/Zend/Form/View/Helper/FormCheckbox.php
index 46b1bf96063..7d6df407c71 100644
--- a/library/Zend/Form/View/Helper/FormCheckbox.php
+++ b/library/Zend/Form/View/Helper/FormCheckbox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormCheckbox extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormCollection.php b/library/Zend/Form/View/Helper/FormCollection.php
index c20a2a997b0..a401cdf7d6b 100644
--- a/library/Zend/Form/View/Helper/FormCollection.php
+++ b/library/Zend/Form/View/Helper/FormCollection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormCollection extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormColor.php b/library/Zend/Form/View/Helper/FormColor.php
index 9ddf11f6da6..556f40e77d6 100644
--- a/library/Zend/Form/View/Helper/FormColor.php
+++ b/library/Zend/Form/View/Helper/FormColor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormColor extends FormInput
 {
@@ -58,4 +54,4 @@ protected function getType(ElementInterface $element)
     {
         return 'color';
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Form/View/Helper/FormDate.php b/library/Zend/Form/View/Helper/FormDate.php
index 62f135eac1e..f2fc080b511 100644
--- a/library/Zend/Form/View/Helper/FormDate.php
+++ b/library/Zend/Form/View/Helper/FormDate.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormDate extends FormDateTime
 {
diff --git a/library/Zend/Form/View/Helper/FormDateTime.php b/library/Zend/Form/View/Helper/FormDateTime.php
index 722e9d30b04..42b39b98606 100644
--- a/library/Zend/Form/View/Helper/FormDateTime.php
+++ b/library/Zend/Form/View/Helper/FormDateTime.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormDateTime extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormDateTimeLocal.php b/library/Zend/Form/View/Helper/FormDateTimeLocal.php
index 9f7cbc635ba..fa4a81b4021 100644
--- a/library/Zend/Form/View/Helper/FormDateTimeLocal.php
+++ b/library/Zend/Form/View/Helper/FormDateTimeLocal.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormDateTimeLocal extends FormDateTime
 {
diff --git a/library/Zend/Form/View/Helper/FormElement.php b/library/Zend/Form/View/Helper/FormElement.php
index 2361a009475..89c225e7ff5 100644
--- a/library/Zend/Form/View/Helper/FormElement.php
+++ b/library/Zend/Form/View/Helper/FormElement.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormElement extends BaseAbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormElementErrors.php b/library/Zend/Form/View/Helper/FormElementErrors.php
index 29b74f1fa75..392fcbaa761 100644
--- a/library/Zend/Form/View/Helper/FormElementErrors.php
+++ b/library/Zend/Form/View/Helper/FormElementErrors.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormElementErrors extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormEmail.php b/library/Zend/Form/View/Helper/FormEmail.php
index f6050aa7cbe..cd72691f09e 100644
--- a/library/Zend/Form/View/Helper/FormEmail.php
+++ b/library/Zend/Form/View/Helper/FormEmail.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormEmail extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormFile.php b/library/Zend/Form/View/Helper/FormFile.php
index 76b3fbd5e42..0adee380a3b 100644
--- a/library/Zend/Form/View/Helper/FormFile.php
+++ b/library/Zend/Form/View/Helper/FormFile.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormFile extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormHidden.php b/library/Zend/Form/View/Helper/FormHidden.php
index 5ef22935d24..30fc1ccabf3 100644
--- a/library/Zend/Form/View/Helper/FormHidden.php
+++ b/library/Zend/Form/View/Helper/FormHidden.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormHidden extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormImage.php b/library/Zend/Form/View/Helper/FormImage.php
index eadd0d5ef19..631f487ba78 100644
--- a/library/Zend/Form/View/Helper/FormImage.php
+++ b/library/Zend/Form/View/Helper/FormImage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormImage extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormInput.php b/library/Zend/Form/View/Helper/FormInput.php
index 71857c98e45..ebc36918bb6 100644
--- a/library/Zend/Form/View/Helper/FormInput.php
+++ b/library/Zend/Form/View/Helper/FormInput.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormInput extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormLabel.php b/library/Zend/Form/View/Helper/FormLabel.php
index 8a80bbe11a7..5c6d3026224 100644
--- a/library/Zend/Form/View/Helper/FormLabel.php
+++ b/library/Zend/Form/View/Helper/FormLabel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormLabel extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormMonth.php b/library/Zend/Form/View/Helper/FormMonth.php
index 764a5f56ee3..adb8c2c1705 100644
--- a/library/Zend/Form/View/Helper/FormMonth.php
+++ b/library/Zend/Form/View/Helper/FormMonth.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormMonth extends FormDateTime
 {
diff --git a/library/Zend/Form/View/Helper/FormMultiCheckbox.php b/library/Zend/Form/View/Helper/FormMultiCheckbox.php
index 3c4624be2af..c8c3e186602 100644
--- a/library/Zend/Form/View/Helper/FormMultiCheckbox.php
+++ b/library/Zend/Form/View/Helper/FormMultiCheckbox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormMultiCheckbox extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormNumber.php b/library/Zend/Form/View/Helper/FormNumber.php
index 0c70e51e537..d23378e514c 100644
--- a/library/Zend/Form/View/Helper/FormNumber.php
+++ b/library/Zend/Form/View/Helper/FormNumber.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormNumber extends FormInput
 {
@@ -64,4 +60,4 @@ protected function getType(ElementInterface $element)
     {
         return 'number';
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Form/View/Helper/FormPassword.php b/library/Zend/Form/View/Helper/FormPassword.php
index a87e6e84429..30c5f8a35ad 100644
--- a/library/Zend/Form/View/Helper/FormPassword.php
+++ b/library/Zend/Form/View/Helper/FormPassword.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormPassword extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormRadio.php b/library/Zend/Form/View/Helper/FormRadio.php
index 731ee6583d7..28a0622434e 100644
--- a/library/Zend/Form/View/Helper/FormRadio.php
+++ b/library/Zend/Form/View/Helper/FormRadio.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormRadio extends FormMultiCheckbox
 {
diff --git a/library/Zend/Form/View/Helper/FormRange.php b/library/Zend/Form/View/Helper/FormRange.php
index 829954a4dfe..16016d084fa 100644
--- a/library/Zend/Form/View/Helper/FormRange.php
+++ b/library/Zend/Form/View/Helper/FormRange.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormRange extends FormInput
 {
@@ -62,4 +58,4 @@ protected function getType(ElementInterface $element)
     {
         return 'range';
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Form/View/Helper/FormReset.php b/library/Zend/Form/View/Helper/FormReset.php
index 977eafb3285..d4c6850f711 100644
--- a/library/Zend/Form/View/Helper/FormReset.php
+++ b/library/Zend/Form/View/Helper/FormReset.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormReset extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
index 7cd5221f50f..b06200d6ba4 100644
--- a/library/Zend/Form/View/Helper/FormRow.php
+++ b/library/Zend/Form/View/Helper/FormRow.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormRow extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormSearch.php b/library/Zend/Form/View/Helper/FormSearch.php
index c52b7a8a1c1..2f139622494 100644
--- a/library/Zend/Form/View/Helper/FormSearch.php
+++ b/library/Zend/Form/View/Helper/FormSearch.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormSearch extends FormText
 {
diff --git a/library/Zend/Form/View/Helper/FormSelect.php b/library/Zend/Form/View/Helper/FormSelect.php
index f63b9070fa7..fcc91dee623 100644
--- a/library/Zend/Form/View/Helper/FormSelect.php
+++ b/library/Zend/Form/View/Helper/FormSelect.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormSelect extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormSubmit.php b/library/Zend/Form/View/Helper/FormSubmit.php
index f1da2fbf45a..5c3d3cc4bac 100644
--- a/library/Zend/Form/View/Helper/FormSubmit.php
+++ b/library/Zend/Form/View/Helper/FormSubmit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormSubmit extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormTel.php b/library/Zend/Form/View/Helper/FormTel.php
index 368f7dea56f..43bcfdfcce6 100644
--- a/library/Zend/Form/View/Helper/FormTel.php
+++ b/library/Zend/Form/View/Helper/FormTel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormTel extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormText.php b/library/Zend/Form/View/Helper/FormText.php
index 909d7ce3c09..ad6d594f846 100644
--- a/library/Zend/Form/View/Helper/FormText.php
+++ b/library/Zend/Form/View/Helper/FormText.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormText extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormTextarea.php b/library/Zend/Form/View/Helper/FormTextarea.php
index 77e03907055..1993e8b3aa0 100644
--- a/library/Zend/Form/View/Helper/FormTextarea.php
+++ b/library/Zend/Form/View/Helper/FormTextarea.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormTextarea extends AbstractHelper
 {
diff --git a/library/Zend/Form/View/Helper/FormTime.php b/library/Zend/Form/View/Helper/FormTime.php
index ce5220a789b..9dce8d8674d 100644
--- a/library/Zend/Form/View/Helper/FormTime.php
+++ b/library/Zend/Form/View/Helper/FormTime.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormTime extends FormDateTime
 {
diff --git a/library/Zend/Form/View/Helper/FormUrl.php b/library/Zend/Form/View/Helper/FormUrl.php
index 56f1f03a900..5191a87b9df 100644
--- a/library/Zend/Form/View/Helper/FormUrl.php
+++ b/library/Zend/Form/View/Helper/FormUrl.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormUrl extends FormInput
 {
diff --git a/library/Zend/Form/View/Helper/FormWeek.php b/library/Zend/Form/View/Helper/FormWeek.php
index aac9b400f3b..44a5607d62c 100644
--- a/library/Zend/Form/View/Helper/FormWeek.php
+++ b/library/Zend/Form/View/Helper/FormWeek.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FormWeek extends FormDateTime
 {
diff --git a/library/Zend/Form/View/HelperConfiguration.php b/library/Zend/Form/View/HelperConfiguration.php
index c1a698f730f..8af1a260e84 100644
--- a/library/Zend/Form/View/HelperConfiguration.php
+++ b/library/Zend/Form/View/HelperConfiguration.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Form\View;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Form
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelperConfiguration implements ConfigurationInterface
 {
diff --git a/library/Zend/GData/Analytics.php b/library/Zend/GData/Analytics.php
index 9a6b03aed09..0a554264d88 100644
--- a/library/Zend/GData/Analytics.php
+++ b/library/Zend/GData/Analytics.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
diff --git a/library/Zend/GData/Analytics/AccountEntry.php b/library/Zend/GData/Analytics/AccountEntry.php
index 8e4215f8530..b956e809e98 100644
--- a/library/Zend/GData/Analytics/AccountEntry.php
+++ b/library/Zend/GData/Analytics/AccountEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics;
diff --git a/library/Zend/GData/Analytics/AccountFeed.php b/library/Zend/GData/Analytics/AccountFeed.php
index 2aaaccf6f3b..5261c347942 100644
--- a/library/Zend/GData/Analytics/AccountFeed.php
+++ b/library/Zend/GData/Analytics/AccountFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics;
diff --git a/library/Zend/GData/Analytics/DataEntry.php b/library/Zend/GData/Analytics/DataEntry.php
index 2eda7935fa7..76d99d1d23f 100644
--- a/library/Zend/GData/Analytics/DataEntry.php
+++ b/library/Zend/GData/Analytics/DataEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics;
diff --git a/library/Zend/GData/Analytics/DataFeed.php b/library/Zend/GData/Analytics/DataFeed.php
index 99ba5661154..dfef66ca586 100644
--- a/library/Zend/GData/Analytics/DataFeed.php
+++ b/library/Zend/GData/Analytics/DataFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics;
diff --git a/library/Zend/GData/Analytics/DataQuery.php b/library/Zend/GData/Analytics/DataQuery.php
index 44069a8b0b0..58f906143cc 100644
--- a/library/Zend/GData/Analytics/DataQuery.php
+++ b/library/Zend/GData/Analytics/DataQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics;
diff --git a/library/Zend/GData/Analytics/Extension/Dimension.php b/library/Zend/GData/Analytics/Extension/Dimension.php
index d0bb73fca82..e3703366178 100644
--- a/library/Zend/GData/Analytics/Extension/Dimension.php
+++ b/library/Zend/GData/Analytics/Extension/Dimension.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics\Extension;
diff --git a/library/Zend/GData/Analytics/Extension/Metric.php b/library/Zend/GData/Analytics/Extension/Metric.php
index 8832ce2dbcd..d286cab6d03 100644
--- a/library/Zend/GData/Analytics/Extension/Metric.php
+++ b/library/Zend/GData/Analytics/Extension/Metric.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics\Extension;
diff --git a/library/Zend/GData/Analytics/Extension/Property.php b/library/Zend/GData/Analytics/Extension/Property.php
index b6c5330fa1e..70fb710b65f 100644
--- a/library/Zend/GData/Analytics/Extension/Property.php
+++ b/library/Zend/GData/Analytics/Extension/Property.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics\Extension;
diff --git a/library/Zend/GData/Analytics/Extension/TableId.php b/library/Zend/GData/Analytics/Extension/TableId.php
index d671be871b8..7feb494119a 100644
--- a/library/Zend/GData/Analytics/Extension/TableId.php
+++ b/library/Zend/GData/Analytics/Extension/TableId.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Analytics
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Analytics\Extension;
diff --git a/library/Zend/GData/App.php b/library/Zend/GData/App.php
index f54f78fb36d..e189cadebdc 100644
--- a/library/Zend/GData/App.php
+++ b/library/Zend/GData/App.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class App
 {
diff --git a/library/Zend/GData/App/AbstractBase.php b/library/Zend/GData/App/AbstractBase.php
index 534edcfa1ff..8c8b7948af1 100644
--- a/library/Zend/GData/App/AbstractBase.php
+++ b/library/Zend/GData/App/AbstractBase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractBase
 {
diff --git a/library/Zend/GData/App/AbstractBaseMediaSource.php b/library/Zend/GData/App/AbstractBaseMediaSource.php
index f095fee272a..f9e1b46f77a 100644
--- a/library/Zend/GData/App/AbstractBaseMediaSource.php
+++ b/library/Zend/GData/App/AbstractBaseMediaSource.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractBaseMediaSource implements MediaSource
 {
diff --git a/library/Zend/GData/App/AbstractFeedEntryParent.php b/library/Zend/GData/App/AbstractFeedEntryParent.php
index 4740dc655e7..ef162228ba8 100644
--- a/library/Zend/GData/App/AbstractFeedEntryParent.php
+++ b/library/Zend/GData/App/AbstractFeedEntryParent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFeedEntryParent extends AbstractBase
 {
diff --git a/library/Zend/GData/App/AbstractFeedSourceParent.php b/library/Zend/GData/App/AbstractFeedSourceParent.php
index c682ebe9a46..02fc5736e1e 100644
--- a/library/Zend/GData/App/AbstractFeedSourceParent.php
+++ b/library/Zend/GData/App/AbstractFeedSourceParent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFeedSourceParent extends AbstractFeedEntryParent
 {
diff --git a/library/Zend/GData/App/AuthException.php b/library/Zend/GData/App/AuthException.php
index 514d8dfaa25..084d5cc556c 100644
--- a/library/Zend/GData/App/AuthException.php
+++ b/library/Zend/GData/App/AuthException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AuthException extends Exception
 {
diff --git a/library/Zend/GData/App/BadMethodCallException.php b/library/Zend/GData/App/BadMethodCallException.php
index ddeae0bf143..c09434d2feb 100644
--- a/library/Zend/GData/App/BadMethodCallException.php
+++ b/library/Zend/GData/App/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends Exception
 {
diff --git a/library/Zend/GData/App/CaptchaRequiredException.php b/library/Zend/GData/App/CaptchaRequiredException.php
index 2c0191a7a66..1c2839da44e 100644
--- a/library/Zend/GData/App/CaptchaRequiredException.php
+++ b/library/Zend/GData/App/CaptchaRequiredException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CaptchaRequiredException extends AuthException
 {
diff --git a/library/Zend/GData/App/Entry.php b/library/Zend/GData/App/Entry.php
index 5995aef77f6..ffd02431de1 100644
--- a/library/Zend/GData/App/Entry.php
+++ b/library/Zend/GData/App/Entry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Entry extends AbstractFeedEntryParent
 {
diff --git a/library/Zend/GData/App/Exception.php b/library/Zend/GData/App/Exception.php
index a42c73430a5..0d4e8a07372 100644
--- a/library/Zend/GData/App/Exception.php
+++ b/library/Zend/GData/App/Exception.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Exception extends \Exception
 {
diff --git a/library/Zend/GData/App/Extension/AbstractExtension.php b/library/Zend/GData/App/Extension/AbstractExtension.php
index 9401c0de589..4b55bb4e4e6 100644
--- a/library/Zend/GData/App/Extension/AbstractExtension.php
+++ b/library/Zend/GData/App/Extension/AbstractExtension.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractExtension extends AbstractBase
 {
diff --git a/library/Zend/GData/App/Extension/AbstractPerson.php b/library/Zend/GData/App/Extension/AbstractPerson.php
index aab6b83047c..4e5789bac83 100644
--- a/library/Zend/GData/App/Extension/AbstractPerson.php
+++ b/library/Zend/GData/App/Extension/AbstractPerson.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPerson extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/AbstractText.php b/library/Zend/GData/App/Extension/AbstractText.php
index 60c5fac4b6c..e02c15e12de 100644
--- a/library/Zend/GData/App/Extension/AbstractText.php
+++ b/library/Zend/GData/App/Extension/AbstractText.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractText extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Author.php b/library/Zend/GData/App/Extension/Author.php
index a36db1c52db..bb033e8439a 100644
--- a/library/Zend/GData/App/Extension/Author.php
+++ b/library/Zend/GData/App/Extension/Author.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Author extends AbstractPerson
 {
diff --git a/library/Zend/GData/App/Extension/Category.php b/library/Zend/GData/App/Extension/Category.php
index 855549c4d53..5dbab26f1dc 100644
--- a/library/Zend/GData/App/Extension/Category.php
+++ b/library/Zend/GData/App/Extension/Category.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Category extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Content.php b/library/Zend/GData/App/Extension/Content.php
index 4845766945e..76ecc9336ab 100644
--- a/library/Zend/GData/App/Extension/Content.php
+++ b/library/Zend/GData/App/Extension/Content.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Content extends AbstractText
 {
diff --git a/library/Zend/GData/App/Extension/Contributor.php b/library/Zend/GData/App/Extension/Contributor.php
index 286d742f40c..13698b9dabe 100644
--- a/library/Zend/GData/App/Extension/Contributor.php
+++ b/library/Zend/GData/App/Extension/Contributor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Contributor extends AbstractPerson
 {
diff --git a/library/Zend/GData/App/Extension/Control.php b/library/Zend/GData/App/Extension/Control.php
index 31798fa53cd..dcbd8c471ef 100644
--- a/library/Zend/GData/App/Extension/Control.php
+++ b/library/Zend/GData/App/Extension/Control.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Control extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Draft.php b/library/Zend/GData/App/Extension/Draft.php
index e2bb1c217e4..8b5ec64a4b5 100644
--- a/library/Zend/GData/App/Extension/Draft.php
+++ b/library/Zend/GData/App/Extension/Draft.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Draft extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Edited.php b/library/Zend/GData/App/Extension/Edited.php
index 834ab52011b..fe8ae30e23c 100644
--- a/library/Zend/GData/App/Extension/Edited.php
+++ b/library/Zend/GData/App/Extension/Edited.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Edited extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Element.php b/library/Zend/GData/App/Extension/Element.php
index e6c95fda862..894fcb2fba1 100644
--- a/library/Zend/GData/App/Extension/Element.php
+++ b/library/Zend/GData/App/Extension/Element.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Element extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Email.php b/library/Zend/GData/App/Extension/Email.php
index 4c49f2cafc5..3a57a6b5e35 100644
--- a/library/Zend/GData/App/Extension/Email.php
+++ b/library/Zend/GData/App/Extension/Email.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Email extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Generator.php b/library/Zend/GData/App/Extension/Generator.php
index 0dc75bbeb4d..204ba2bc94c 100644
--- a/library/Zend/GData/App/Extension/Generator.php
+++ b/library/Zend/GData/App/Extension/Generator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Generator extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Icon.php b/library/Zend/GData/App/Extension/Icon.php
index cb67d290f2b..c85a773e2ac 100644
--- a/library/Zend/GData/App/Extension/Icon.php
+++ b/library/Zend/GData/App/Extension/Icon.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Icon extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Id.php b/library/Zend/GData/App/Extension/Id.php
index e3ea6a68145..06ef5c20d2b 100644
--- a/library/Zend/GData/App/Extension/Id.php
+++ b/library/Zend/GData/App/Extension/Id.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Id extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Link.php b/library/Zend/GData/App/Extension/Link.php
index 60cc7a4857e..ecbb812e21c 100644
--- a/library/Zend/GData/App/Extension/Link.php
+++ b/library/Zend/GData/App/Extension/Link.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Link extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Logo.php b/library/Zend/GData/App/Extension/Logo.php
index 39df1c73c1d..161a1b5b15c 100644
--- a/library/Zend/GData/App/Extension/Logo.php
+++ b/library/Zend/GData/App/Extension/Logo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Logo extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Name.php b/library/Zend/GData/App/Extension/Name.php
index f31c8bfde39..deda1313d94 100644
--- a/library/Zend/GData/App/Extension/Name.php
+++ b/library/Zend/GData/App/Extension/Name.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Name extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Published.php b/library/Zend/GData/App/Extension/Published.php
index 6ea5b07e306..e23ec7057ce 100644
--- a/library/Zend/GData/App/Extension/Published.php
+++ b/library/Zend/GData/App/Extension/Published.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Published extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Rights.php b/library/Zend/GData/App/Extension/Rights.php
index 5085a6b5d7d..bd4d275e745 100644
--- a/library/Zend/GData/App/Extension/Rights.php
+++ b/library/Zend/GData/App/Extension/Rights.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rights extends AbstractText
 {
diff --git a/library/Zend/GData/App/Extension/Source.php b/library/Zend/GData/App/Extension/Source.php
index 371c6bd5ccd..eaa280651e3 100644
--- a/library/Zend/GData/App/Extension/Source.php
+++ b/library/Zend/GData/App/Extension/Source.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Source extends \Zend\GData\App\AbstractFeedSourceParent
 {
diff --git a/library/Zend/GData/App/Extension/Subtitle.php b/library/Zend/GData/App/Extension/Subtitle.php
index 0e44bd7875e..726084c5ec3 100644
--- a/library/Zend/GData/App/Extension/Subtitle.php
+++ b/library/Zend/GData/App/Extension/Subtitle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Subtitle extends AbstractText
 {
diff --git a/library/Zend/GData/App/Extension/Summary.php b/library/Zend/GData/App/Extension/Summary.php
index dd5cf928080..493d069ac35 100644
--- a/library/Zend/GData/App/Extension/Summary.php
+++ b/library/Zend/GData/App/Extension/Summary.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Summary extends AbstractText
 {
diff --git a/library/Zend/GData/App/Extension/Title.php b/library/Zend/GData/App/Extension/Title.php
index ec5c23677ae..5dd77581e82 100644
--- a/library/Zend/GData/App/Extension/Title.php
+++ b/library/Zend/GData/App/Extension/Title.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Title extends AbstractText
 {
diff --git a/library/Zend/GData/App/Extension/Updated.php b/library/Zend/GData/App/Extension/Updated.php
index 03e24e11a56..32df2162f81 100644
--- a/library/Zend/GData/App/Extension/Updated.php
+++ b/library/Zend/GData/App/Extension/Updated.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Updated extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Extension/Uri.php b/library/Zend/GData/App/Extension/Uri.php
index 7def8f60b22..3bec4355aeb 100644
--- a/library/Zend/GData/App/Extension/Uri.php
+++ b/library/Zend/GData/App/Extension/Uri.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Uri extends AbstractExtension
 {
diff --git a/library/Zend/GData/App/Feed.php b/library/Zend/GData/App/Feed.php
index a028530dd56..d7bc726b2f5 100644
--- a/library/Zend/GData/App/Feed.php
+++ b/library/Zend/GData/App/Feed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends AbstractFeedSourceParent
         implements \Iterator, \ArrayAccess, \Countable
diff --git a/library/Zend/GData/App/HttpException.php b/library/Zend/GData/App/HttpException.php
index 3734417929b..88c4352a252 100644
--- a/library/Zend/GData/App/HttpException.php
+++ b/library/Zend/GData/App/HttpException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpException extends Exception
 {
diff --git a/library/Zend/GData/App/IOException.php b/library/Zend/GData/App/IOException.php
index 344a281764e..4f1e0918510 100644
--- a/library/Zend/GData/App/IOException.php
+++ b/library/Zend/GData/App/IOException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IOException extends Exception
 {
diff --git a/library/Zend/GData/App/InvalidArgumentException.php b/library/Zend/GData/App/InvalidArgumentException.php
index 4b71731680e..265075de9aa 100644
--- a/library/Zend/GData/App/InvalidArgumentException.php
+++ b/library/Zend/GData/App/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception
 {
diff --git a/library/Zend/GData/App/LoggingHttpClientAdapterSocket.php b/library/Zend/GData/App/LoggingHttpClientAdapterSocket.php
index 4c9cd1ebca1..aaec907bfbb 100644
--- a/library/Zend/GData/App/LoggingHttpClientAdapterSocket.php
+++ b/library/Zend/GData/App/LoggingHttpClientAdapterSocket.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LoggingHttpClientAdapterSocket extends \Zend\Http\Client\Adapter\Socket
 {
diff --git a/library/Zend/GData/App/MediaEntry.php b/library/Zend/GData/App/MediaEntry.php
index 01b92afd412..adfeb8f64fa 100644
--- a/library/Zend/GData/App/MediaEntry.php
+++ b/library/Zend/GData/App/MediaEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaEntry extends Entry
 {
diff --git a/library/Zend/GData/App/MediaFileSource.php b/library/Zend/GData/App/MediaFileSource.php
index 95c29e7aece..df6c34100ef 100644
--- a/library/Zend/GData/App/MediaFileSource.php
+++ b/library/Zend/GData/App/MediaFileSource.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaFileSource extends AbstractBaseMediaSource
 {
diff --git a/library/Zend/GData/App/MediaSource.php b/library/Zend/GData/App/MediaSource.php
index 62f0799b9ec..524b265849b 100644
--- a/library/Zend/GData/App/MediaSource.php
+++ b/library/Zend/GData/App/MediaSource.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface MediaSource
 {
diff --git a/library/Zend/GData/App/Util.php b/library/Zend/GData/App/Util.php
index a8214b03a55..a9b18ff96d6 100644
--- a/library/Zend/GData/App/Util.php
+++ b/library/Zend/GData/App/Util.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Util
 {
diff --git a/library/Zend/GData/App/VersionException.php b/library/Zend/GData/App/VersionException.php
index a8994157d33..72cd44eefb1 100644
--- a/library/Zend/GData/App/VersionException.php
+++ b/library/Zend/GData/App/VersionException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\App;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VersionException extends Exception
 {
diff --git a/library/Zend/GData/AuthSub.php b/library/Zend/GData/AuthSub.php
index 531c3786c13..3a0f18096c6 100644
--- a/library/Zend/GData/AuthSub.php
+++ b/library/Zend/GData/AuthSub.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AuthSub
 {
diff --git a/library/Zend/GData/Books.php b/library/Zend/GData/Books.php
index a8a683ffc03..1126f436f39 100644
--- a/library/Zend/GData/Books.php
+++ b/library/Zend/GData/Books.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Books extends GData
 {
diff --git a/library/Zend/GData/Books/CollectionEntry.php b/library/Zend/GData/Books/CollectionEntry.php
index 24fc695abfd..ac3d12ef935 100644
--- a/library/Zend/GData/Books/CollectionEntry.php
+++ b/library/Zend/GData/Books/CollectionEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CollectionEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Books/CollectionFeed.php b/library/Zend/GData/Books/CollectionFeed.php
index c4c906324ce..c50c7669c16 100644
--- a/library/Zend/GData/Books/CollectionFeed.php
+++ b/library/Zend/GData/Books/CollectionFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CollectionFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Books/Extension/AnnotationLink.php b/library/Zend/GData/Books/Extension/AnnotationLink.php
index 678781aa72a..e0bb9d990ee 100644
--- a/library/Zend/GData/Books/Extension/AnnotationLink.php
+++ b/library/Zend/GData/Books/Extension/AnnotationLink.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AnnotationLink extends
     BooksLink
diff --git a/library/Zend/GData/Books/Extension/BooksCategory.php b/library/Zend/GData/Books/Extension/BooksCategory.php
index f0d62c6fcaa..248a14b6fa7 100644
--- a/library/Zend/GData/Books/Extension/BooksCategory.php
+++ b/library/Zend/GData/Books/Extension/BooksCategory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BooksCategory extends
     \Zend\GData\App\Extension\Category
diff --git a/library/Zend/GData/Books/Extension/BooksLink.php b/library/Zend/GData/Books/Extension/BooksLink.php
index aea382d9cde..cbaba3e5582 100644
--- a/library/Zend/GData/Books/Extension/BooksLink.php
+++ b/library/Zend/GData/Books/Extension/BooksLink.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BooksLink extends \Zend\GData\App\Extension\Link
 {
diff --git a/library/Zend/GData/Books/Extension/Embeddability.php b/library/Zend/GData/Books/Extension/Embeddability.php
index 59ec7a2da3b..c7e71e1fc92 100644
--- a/library/Zend/GData/Books/Extension/Embeddability.php
+++ b/library/Zend/GData/Books/Extension/Embeddability.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Embeddability extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Books/Extension/InfoLink.php b/library/Zend/GData/Books/Extension/InfoLink.php
index 5303ad2f6f6..dd0fbc1fbd5 100644
--- a/library/Zend/GData/Books/Extension/InfoLink.php
+++ b/library/Zend/GData/Books/Extension/InfoLink.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -26,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InfoLink extends
     BooksLink
diff --git a/library/Zend/GData/Books/Extension/PreviewLink.php b/library/Zend/GData/Books/Extension/PreviewLink.php
index 22c9ec6975a..b41bd9cf8d1 100644
--- a/library/Zend/GData/Books/Extension/PreviewLink.php
+++ b/library/Zend/GData/Books/Extension/PreviewLink.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PreviewLink extends
     BooksLink
diff --git a/library/Zend/GData/Books/Extension/Review.php b/library/Zend/GData/Books/Extension/Review.php
index c4d382e2bcb..650633061f5 100644
--- a/library/Zend/GData/Books/Extension/Review.php
+++ b/library/Zend/GData/Books/Extension/Review.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Review extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Books/Extension/ThumbnailLink.php b/library/Zend/GData/Books/Extension/ThumbnailLink.php
index 11738873733..aaf96320a65 100644
--- a/library/Zend/GData/Books/Extension/ThumbnailLink.php
+++ b/library/Zend/GData/Books/Extension/ThumbnailLink.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ThumbnailLink extends
     BooksLink
diff --git a/library/Zend/GData/Books/Extension/Viewability.php b/library/Zend/GData/Books/Extension/Viewability.php
index f9c372a5e54..65cd7390f34 100644
--- a/library/Zend/GData/Books/Extension/Viewability.php
+++ b/library/Zend/GData/Books/Extension/Viewability.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Viewability extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Books/VolumeEntry.php b/library/Zend/GData/Books/VolumeEntry.php
index e348b165353..3278f355244 100644
--- a/library/Zend/GData/Books/VolumeEntry.php
+++ b/library/Zend/GData/Books/VolumeEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VolumeEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Books/VolumeFeed.php b/library/Zend/GData/Books/VolumeFeed.php
index 90f3001aa13..e2d1eaffd73 100644
--- a/library/Zend/GData/Books/VolumeFeed.php
+++ b/library/Zend/GData/Books/VolumeFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VolumeFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Books/VolumeQuery.php b/library/Zend/GData/Books/VolumeQuery.php
index 2b370628804..3e00bfee792 100644
--- a/library/Zend/GData/Books/VolumeQuery.php
+++ b/library/Zend/GData/Books/VolumeQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Books;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VolumeQuery extends \Zend\GData\Query
 {
diff --git a/library/Zend/GData/Calendar.php b/library/Zend/GData/Calendar.php
index f6641dc0833..e1e304f8539 100644
--- a/library/Zend/GData/Calendar.php
+++ b/library/Zend/GData/Calendar.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Calendar extends GData
 {
diff --git a/library/Zend/GData/Calendar/EventEntry.php b/library/Zend/GData/Calendar/EventEntry.php
index a3fb8cd87a9..eb86e1f69d4 100644
--- a/library/Zend/GData/Calendar/EventEntry.php
+++ b/library/Zend/GData/Calendar/EventEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EventEntry extends \Zend\GData\Kind\EventEntry
 {
diff --git a/library/Zend/GData/Calendar/EventFeed.php b/library/Zend/GData/Calendar/EventFeed.php
index fea3986af61..7087019531f 100644
--- a/library/Zend/GData/Calendar/EventFeed.php
+++ b/library/Zend/GData/Calendar/EventFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EventFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Calendar/EventQuery.php b/library/Zend/GData/Calendar/EventQuery.php
index e247154f395..d4403161792 100644
--- a/library/Zend/GData/Calendar/EventQuery.php
+++ b/library/Zend/GData/Calendar/EventQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EventQuery extends \Zend\GData\Query
 {
diff --git a/library/Zend/GData/Calendar/Extension/AccessLevel.php b/library/Zend/GData/Calendar/Extension/AccessLevel.php
index b668d1fbfeb..a1adde9d7b7 100644
--- a/library/Zend/GData/Calendar/Extension/AccessLevel.php
+++ b/library/Zend/GData/Calendar/Extension/AccessLevel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AccessLevel extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/Extension/Color.php b/library/Zend/GData/Calendar/Extension/Color.php
index 31f4095537b..5354973f09a 100644
--- a/library/Zend/GData/Calendar/Extension/Color.php
+++ b/library/Zend/GData/Calendar/Extension/Color.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Color extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/Extension/Hidden.php b/library/Zend/GData/Calendar/Extension/Hidden.php
index f7fa6f0688a..35db284e0ef 100644
--- a/library/Zend/GData/Calendar/Extension/Hidden.php
+++ b/library/Zend/GData/Calendar/Extension/Hidden.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hidden extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/Extension/Link.php b/library/Zend/GData/Calendar/Extension/Link.php
index 4a52906efa2..fcd13b5f77f 100644
--- a/library/Zend/GData/Calendar/Extension/Link.php
+++ b/library/Zend/GData/Calendar/Extension/Link.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Link extends \Zend\GData\App\Extension\Link
 {
diff --git a/library/Zend/GData/Calendar/Extension/QuickAdd.php b/library/Zend/GData/Calendar/Extension/QuickAdd.php
index 2fbe39e5241..04bf5dc400d 100644
--- a/library/Zend/GData/Calendar/Extension/QuickAdd.php
+++ b/library/Zend/GData/Calendar/Extension/QuickAdd.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QuickAdd extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/Extension/Selected.php b/library/Zend/GData/Calendar/Extension/Selected.php
index 60853a6b17e..137d6358756 100644
--- a/library/Zend/GData/Calendar/Extension/Selected.php
+++ b/library/Zend/GData/Calendar/Extension/Selected.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Selected extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/Extension/SendEventNotifications.php b/library/Zend/GData/Calendar/Extension/SendEventNotifications.php
index 0498ab46015..db5a2369246 100644
--- a/library/Zend/GData/Calendar/Extension/SendEventNotifications.php
+++ b/library/Zend/GData/Calendar/Extension/SendEventNotifications.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SendEventNotifications extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/Extension/Timezone.php b/library/Zend/GData/Calendar/Extension/Timezone.php
index 942a27a1515..43ad1a4d30d 100644
--- a/library/Zend/GData/Calendar/Extension/Timezone.php
+++ b/library/Zend/GData/Calendar/Extension/Timezone.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Timezone extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/Extension/WebContent.php b/library/Zend/GData/Calendar/Extension/WebContent.php
index d2f2379893c..9c98ff14bc6 100644
--- a/library/Zend/GData/Calendar/Extension/WebContent.php
+++ b/library/Zend/GData/Calendar/Extension/WebContent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WebContent extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Calendar/ListEntry.php b/library/Zend/GData/Calendar/ListEntry.php
index c3f2486661a..886bb193bef 100644
--- a/library/Zend/GData/Calendar/ListEntry.php
+++ b/library/Zend/GData/Calendar/ListEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ListEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Calendar/ListFeed.php b/library/Zend/GData/Calendar/ListFeed.php
index 322592eeacc..689e3eb8e8a 100644
--- a/library/Zend/GData/Calendar/ListFeed.php
+++ b/library/Zend/GData/Calendar/ListFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Calendar;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ListFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/ClientLogin.php b/library/Zend/GData/ClientLogin.php
index c4ec93a9c05..b31b55e0560 100644
--- a/library/Zend/GData/ClientLogin.php
+++ b/library/Zend/GData/ClientLogin.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClientLogin
 {
diff --git a/library/Zend/GData/Docs.php b/library/Zend/GData/Docs.php
index 2569dc0a8c4..e448227f1be 100644
--- a/library/Zend/GData/Docs.php
+++ b/library/Zend/GData/Docs.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Docs extends GData
 {
diff --git a/library/Zend/GData/Docs/ACLEntry.php b/library/Zend/GData/Docs/ACLEntry.php
index b018724ec64..bd5aeec8340 100644
--- a/library/Zend/GData/Docs/ACLEntry.php
+++ b/library/Zend/GData/Docs/ACLEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Docs;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ACLEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Docs/DocumentListEntry.php b/library/Zend/GData/Docs/DocumentListEntry.php
index 2e4750929d6..49d982269dc 100644
--- a/library/Zend/GData/Docs/DocumentListEntry.php
+++ b/library/Zend/GData/Docs/DocumentListEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Docs;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentListEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Docs/DocumentListFeed.php b/library/Zend/GData/Docs/DocumentListFeed.php
index e132ac0970c..9b866af5776 100644
--- a/library/Zend/GData/Docs/DocumentListFeed.php
+++ b/library/Zend/GData/Docs/DocumentListFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Docs;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentListFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Docs/Extension/ACLRole.php b/library/Zend/GData/Docs/Extension/ACLRole.php
index b68985801e3..fef147df1c1 100644
--- a/library/Zend/GData/Docs/Extension/ACLRole.php
+++ b/library/Zend/GData/Docs/Extension/ACLRole.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ACLRole extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Docs/Extension/ACLScope.php b/library/Zend/GData/Docs/Extension/ACLScope.php
index 33a3f41b337..bc90b072b12 100644
--- a/library/Zend/GData/Docs/Extension/ACLScope.php
+++ b/library/Zend/GData/Docs/Extension/ACLScope.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ACLScope extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Docs/Query.php b/library/Zend/GData/Docs/Query.php
index a5685b81f65..5cc7aeda4dc 100644
--- a/library/Zend/GData/Docs/Query.php
+++ b/library/Zend/GData/Docs/Query.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Docs;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Query extends \Zend\GData\Query
 {
diff --git a/library/Zend/GData/DublinCore.php b/library/Zend/GData/DublinCore.php
index b4c2aa68d0d..4ad929b1e68 100644
--- a/library/Zend/GData/DublinCore.php
+++ b/library/Zend/GData/DublinCore.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DublinCore extends GData
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Creator.php b/library/Zend/GData/DublinCore/Extension/Creator.php
index 76f2b9a948d..9122d54b5ad 100644
--- a/library/Zend/GData/DublinCore/Extension/Creator.php
+++ b/library/Zend/GData/DublinCore/Extension/Creator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Creator extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Date.php b/library/Zend/GData/DublinCore/Extension/Date.php
index 5c15c821331..6c5e5d2b0a2 100644
--- a/library/Zend/GData/DublinCore/Extension/Date.php
+++ b/library/Zend/GData/DublinCore/Extension/Date.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Date extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Description.php b/library/Zend/GData/DublinCore/Extension/Description.php
index 9283809b04d..334618c2706 100644
--- a/library/Zend/GData/DublinCore/Extension/Description.php
+++ b/library/Zend/GData/DublinCore/Extension/Description.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Description extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Format.php b/library/Zend/GData/DublinCore/Extension/Format.php
index a47167f9c0e..0a94d0618fe 100644
--- a/library/Zend/GData/DublinCore/Extension/Format.php
+++ b/library/Zend/GData/DublinCore/Extension/Format.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Format extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Identifier.php b/library/Zend/GData/DublinCore/Extension/Identifier.php
index 9452be2afdf..21d87579ec9 100644
--- a/library/Zend/GData/DublinCore/Extension/Identifier.php
+++ b/library/Zend/GData/DublinCore/Extension/Identifier.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Identifier extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Language.php b/library/Zend/GData/DublinCore/Extension/Language.php
index 66f686c1e96..d1319aa02f3 100644
--- a/library/Zend/GData/DublinCore/Extension/Language.php
+++ b/library/Zend/GData/DublinCore/Extension/Language.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Language extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Publisher.php b/library/Zend/GData/DublinCore/Extension/Publisher.php
index 69b18f4a248..fa908a0f3e7 100644
--- a/library/Zend/GData/DublinCore/Extension/Publisher.php
+++ b/library/Zend/GData/DublinCore/Extension/Publisher.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Publisher extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Rights.php b/library/Zend/GData/DublinCore/Extension/Rights.php
index 0d3f410abd8..57a5c80e59e 100644
--- a/library/Zend/GData/DublinCore/Extension/Rights.php
+++ b/library/Zend/GData/DublinCore/Extension/Rights.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rights extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Subject.php b/library/Zend/GData/DublinCore/Extension/Subject.php
index 97dc6b41add..e13156e8000 100644
--- a/library/Zend/GData/DublinCore/Extension/Subject.php
+++ b/library/Zend/GData/DublinCore/Extension/Subject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Subject extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/DublinCore/Extension/Title.php b/library/Zend/GData/DublinCore/Extension/Title.php
index 25888c41202..8f777016e2c 100644
--- a/library/Zend/GData/DublinCore/Extension/Title.php
+++ b/library/Zend/GData/DublinCore/Extension/Title.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\DublinCore\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Title extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF.php b/library/Zend/GData/EXIF.php
index a38dd729612..17a4535f1f8 100644
--- a/library/Zend/GData/EXIF.php
+++ b/library/Zend/GData/EXIF.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EXIF extends GData
 {
diff --git a/library/Zend/GData/EXIF/Entry.php b/library/Zend/GData/EXIF/Entry.php
index c077325e2f5..bdd547f2cb5 100644
--- a/library/Zend/GData/EXIF/Entry.php
+++ b/library/Zend/GData/EXIF/Entry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Entry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/EXIF/Extension/Distance.php b/library/Zend/GData/EXIF/Extension/Distance.php
index a0f39daf65d..3812c15d820 100644
--- a/library/Zend/GData/EXIF/Extension/Distance.php
+++ b/library/Zend/GData/EXIF/Extension/Distance.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Distance extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/Exposure.php b/library/Zend/GData/EXIF/Extension/Exposure.php
index 4505648ad58..f667a341140 100644
--- a/library/Zend/GData/EXIF/Extension/Exposure.php
+++ b/library/Zend/GData/EXIF/Extension/Exposure.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Exposure extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/FStop.php b/library/Zend/GData/EXIF/Extension/FStop.php
index 2a733729abe..3f9c0ee14ec 100644
--- a/library/Zend/GData/EXIF/Extension/FStop.php
+++ b/library/Zend/GData/EXIF/Extension/FStop.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FStop extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/Flash.php b/library/Zend/GData/EXIF/Extension/Flash.php
index e1479f2c218..95f946e1e86 100644
--- a/library/Zend/GData/EXIF/Extension/Flash.php
+++ b/library/Zend/GData/EXIF/Extension/Flash.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Flash extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/FocalLength.php b/library/Zend/GData/EXIF/Extension/FocalLength.php
index 968cf732500..98404f29ec6 100644
--- a/library/Zend/GData/EXIF/Extension/FocalLength.php
+++ b/library/Zend/GData/EXIF/Extension/FocalLength.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FocalLength extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/ISO.php b/library/Zend/GData/EXIF/Extension/ISO.php
index 73a32876897..a0b8dd3f0e7 100644
--- a/library/Zend/GData/EXIF/Extension/ISO.php
+++ b/library/Zend/GData/EXIF/Extension/ISO.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ISO extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/ImageUniqueId.php b/library/Zend/GData/EXIF/Extension/ImageUniqueId.php
index dffcd5b2d2c..d32d496d9a9 100644
--- a/library/Zend/GData/EXIF/Extension/ImageUniqueId.php
+++ b/library/Zend/GData/EXIF/Extension/ImageUniqueId.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ImageUniqueId extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/Make.php b/library/Zend/GData/EXIF/Extension/Make.php
index d144c3c2b47..7f7c7c432f9 100644
--- a/library/Zend/GData/EXIF/Extension/Make.php
+++ b/library/Zend/GData/EXIF/Extension/Make.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Make extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/Model.php b/library/Zend/GData/EXIF/Extension/Model.php
index 72b6bb4955e..e922a80bc09 100644
--- a/library/Zend/GData/EXIF/Extension/Model.php
+++ b/library/Zend/GData/EXIF/Extension/Model.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Model extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/Tags.php b/library/Zend/GData/EXIF/Extension/Tags.php
index 17f75072429..0ba669c600c 100644
--- a/library/Zend/GData/EXIF/Extension/Tags.php
+++ b/library/Zend/GData/EXIF/Extension/Tags.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Tags extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Extension/Time.php b/library/Zend/GData/EXIF/Extension/Time.php
index 4451208f7c5..13dd14bdcf1 100644
--- a/library/Zend/GData/EXIF/Extension/Time.php
+++ b/library/Zend/GData/EXIF/Extension/Time.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Time extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/EXIF/Feed.php b/library/Zend/GData/EXIF/Feed.php
index a8a29e8e866..3288d5e5c95 100644
--- a/library/Zend/GData/EXIF/Feed.php
+++ b/library/Zend/GData/EXIF/Feed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\EXIF;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Entry.php b/library/Zend/GData/Entry.php
index 15e4dc05b4b..807bd8be2ea 100644
--- a/library/Zend/GData/Entry.php
+++ b/library/Zend/GData/Entry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Entry extends App\MediaEntry
 {
diff --git a/library/Zend/GData/Extension.php b/library/Zend/GData/Extension.php
index 75697e30e30..0ff7fc5acb0 100644
--- a/library/Zend/GData/Extension.php
+++ b/library/Zend/GData/Extension.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Extension extends AbstractExtension
 {
diff --git a/library/Zend/GData/Extension/AttendeeStatus.php b/library/Zend/GData/Extension/AttendeeStatus.php
index 1fc5c16215f..994a4e0023e 100644
--- a/library/Zend/GData/Extension/AttendeeStatus.php
+++ b/library/Zend/GData/Extension/AttendeeStatus.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AttendeeStatus extends Extension
 {
diff --git a/library/Zend/GData/Extension/AttendeeType.php b/library/Zend/GData/Extension/AttendeeType.php
index 4c099252db9..eb2fc8f569f 100644
--- a/library/Zend/GData/Extension/AttendeeType.php
+++ b/library/Zend/GData/Extension/AttendeeType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AttendeeType extends Extension
 {
diff --git a/library/Zend/GData/Extension/Comments.php b/library/Zend/GData/Extension/Comments.php
index 120292646d1..ccec70cc354 100644
--- a/library/Zend/GData/Extension/Comments.php
+++ b/library/Zend/GData/Extension/Comments.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Comments extends Extension
 {
diff --git a/library/Zend/GData/Extension/EntryLink.php b/library/Zend/GData/Extension/EntryLink.php
index c4a75d7be4d..8efc99341e0 100644
--- a/library/Zend/GData/Extension/EntryLink.php
+++ b/library/Zend/GData/Extension/EntryLink.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EntryLink extends Extension
 {
diff --git a/library/Zend/GData/Extension/EventStatus.php b/library/Zend/GData/Extension/EventStatus.php
index a6365225553..18eecdc765d 100644
--- a/library/Zend/GData/Extension/EventStatus.php
+++ b/library/Zend/GData/Extension/EventStatus.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EventStatus extends Extension
 {
diff --git a/library/Zend/GData/Extension/ExtendedProperty.php b/library/Zend/GData/Extension/ExtendedProperty.php
index c29eed5458d..a5f8f67f324 100644
--- a/library/Zend/GData/Extension/ExtendedProperty.php
+++ b/library/Zend/GData/Extension/ExtendedProperty.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExtendedProperty extends Extension
 {
diff --git a/library/Zend/GData/Extension/FeedLink.php b/library/Zend/GData/Extension/FeedLink.php
index 02bc8590c67..0c37f683f10 100644
--- a/library/Zend/GData/Extension/FeedLink.php
+++ b/library/Zend/GData/Extension/FeedLink.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FeedLink extends Extension
 {
diff --git a/library/Zend/GData/Extension/OpenSearchItemsPerPage.php b/library/Zend/GData/Extension/OpenSearchItemsPerPage.php
index e4a170fabd0..f80bf4ed4c4 100644
--- a/library/Zend/GData/Extension/OpenSearchItemsPerPage.php
+++ b/library/Zend/GData/Extension/OpenSearchItemsPerPage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenSearchItemsPerPage extends Extension
 {
diff --git a/library/Zend/GData/Extension/OpenSearchStartIndex.php b/library/Zend/GData/Extension/OpenSearchStartIndex.php
index 0eb6d9dd6d9..bcda4bb317e 100644
--- a/library/Zend/GData/Extension/OpenSearchStartIndex.php
+++ b/library/Zend/GData/Extension/OpenSearchStartIndex.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenSearchStartIndex extends Extension
 {
diff --git a/library/Zend/GData/Extension/OpenSearchTotalResults.php b/library/Zend/GData/Extension/OpenSearchTotalResults.php
index 1069fc878ad..59a6aa8e90b 100644
--- a/library/Zend/GData/Extension/OpenSearchTotalResults.php
+++ b/library/Zend/GData/Extension/OpenSearchTotalResults.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenSearchTotalResults extends Extension
 {
diff --git a/library/Zend/GData/Extension/OriginalEvent.php b/library/Zend/GData/Extension/OriginalEvent.php
index c4346ac6961..09879daf263 100644
--- a/library/Zend/GData/Extension/OriginalEvent.php
+++ b/library/Zend/GData/Extension/OriginalEvent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OriginalEvent extends Extension
 {
diff --git a/library/Zend/GData/Extension/Rating.php b/library/Zend/GData/Extension/Rating.php
index dbfbf10fb58..62c19a0f574 100644
--- a/library/Zend/GData/Extension/Rating.php
+++ b/library/Zend/GData/Extension/Rating.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rating extends Extension
 {
diff --git a/library/Zend/GData/Extension/Recurrence.php b/library/Zend/GData/Extension/Recurrence.php
index 5004edd38ea..b808f76dbe5 100644
--- a/library/Zend/GData/Extension/Recurrence.php
+++ b/library/Zend/GData/Extension/Recurrence.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Recurrence extends Extension
 {
diff --git a/library/Zend/GData/Extension/RecurrenceException.php b/library/Zend/GData/Extension/RecurrenceException.php
index 5190e25a4a2..864e0c6ab4b 100644
--- a/library/Zend/GData/Extension/RecurrenceException.php
+++ b/library/Zend/GData/Extension/RecurrenceException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RecurrenceException extends Extension
 {
diff --git a/library/Zend/GData/Extension/Reminder.php b/library/Zend/GData/Extension/Reminder.php
index bbb66253930..c5017cfe4cf 100644
--- a/library/Zend/GData/Extension/Reminder.php
+++ b/library/Zend/GData/Extension/Reminder.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Reminder extends Extension
 {
diff --git a/library/Zend/GData/Extension/Transparency.php b/library/Zend/GData/Extension/Transparency.php
index c41367e92c3..115ac4534ef 100644
--- a/library/Zend/GData/Extension/Transparency.php
+++ b/library/Zend/GData/Extension/Transparency.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Transparency extends Extension
 {
diff --git a/library/Zend/GData/Extension/Visibility.php b/library/Zend/GData/Extension/Visibility.php
index 3b9d1f47db2..82fbef1dc49 100644
--- a/library/Zend/GData/Extension/Visibility.php
+++ b/library/Zend/GData/Extension/Visibility.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Visibility extends Extension
 {
diff --git a/library/Zend/GData/Extension/When.php b/library/Zend/GData/Extension/When.php
index d89a3360a3a..05044bd67bf 100644
--- a/library/Zend/GData/Extension/When.php
+++ b/library/Zend/GData/Extension/When.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class When extends Extension
 {
diff --git a/library/Zend/GData/Extension/Where.php b/library/Zend/GData/Extension/Where.php
index e0b657ee141..671e615038c 100644
--- a/library/Zend/GData/Extension/Where.php
+++ b/library/Zend/GData/Extension/Where.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Where extends Extension
 {
diff --git a/library/Zend/GData/Extension/Who.php b/library/Zend/GData/Extension/Who.php
index 703015d37b7..55ef37f34ac 100644
--- a/library/Zend/GData/Extension/Who.php
+++ b/library/Zend/GData/Extension/Who.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Who extends Extension
 {
diff --git a/library/Zend/GData/Feed.php b/library/Zend/GData/Feed.php
index 868bfc06477..7ba92f64d43 100644
--- a/library/Zend/GData/Feed.php
+++ b/library/Zend/GData/Feed.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends App\Feed
 {
diff --git a/library/Zend/GData/GApps.php b/library/Zend/GData/GApps.php
index 4248c87a542..dbdfd5de798 100644
--- a/library/Zend/GData/GApps.php
+++ b/library/Zend/GData/GApps.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GApps extends GData
 {
diff --git a/library/Zend/GData/GApps/AbstractQuery.php b/library/Zend/GData/GApps/AbstractQuery.php
index 7812793f9b7..4151c45e66c 100644
--- a/library/Zend/GData/GApps/AbstractQuery.php
+++ b/library/Zend/GData/GApps/AbstractQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractQuery extends Query
 {
diff --git a/library/Zend/GData/GApps/EmailListEntry.php b/library/Zend/GData/GApps/EmailListEntry.php
index 595419547cf..a8a784d69ef 100644
--- a/library/Zend/GData/GApps/EmailListEntry.php
+++ b/library/Zend/GData/GApps/EmailListEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -40,8 +38,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailListEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/GApps/EmailListFeed.php b/library/Zend/GData/GApps/EmailListFeed.php
index 0cb9cc464d6..0525a6836ef 100644
--- a/library/Zend/GData/GApps/EmailListFeed.php
+++ b/library/Zend/GData/GApps/EmailListFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailListFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/GApps/EmailListQuery.php b/library/Zend/GData/GApps/EmailListQuery.php
index a5840376a6b..3efa3a2b58e 100644
--- a/library/Zend/GData/GApps/EmailListQuery.php
+++ b/library/Zend/GData/GApps/EmailListQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailListQuery extends AbstractQuery
 {
diff --git a/library/Zend/GData/GApps/EmailListRecipientEntry.php b/library/Zend/GData/GApps/EmailListRecipientEntry.php
index 98665c72eaf..dd70bd2e96e 100644
--- a/library/Zend/GData/GApps/EmailListRecipientEntry.php
+++ b/library/Zend/GData/GApps/EmailListRecipientEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -41,8 +39,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailListRecipientEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/GApps/EmailListRecipientFeed.php b/library/Zend/GData/GApps/EmailListRecipientFeed.php
index 5403ab5bfc6..042ea46feaa 100644
--- a/library/Zend/GData/GApps/EmailListRecipientFeed.php
+++ b/library/Zend/GData/GApps/EmailListRecipientFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailListRecipientFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/GApps/EmailListRecipientQuery.php b/library/Zend/GData/GApps/EmailListRecipientQuery.php
index 650fd86472c..2fedb072a4b 100644
--- a/library/Zend/GData/GApps/EmailListRecipientQuery.php
+++ b/library/Zend/GData/GApps/EmailListRecipientQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailListRecipientQuery extends AbstractQuery
 {
diff --git a/library/Zend/GData/GApps/Error.php b/library/Zend/GData/GApps/Error.php
index 0441b3350b4..3ca38645ed5 100644
--- a/library/Zend/GData/GApps/Error.php
+++ b/library/Zend/GData/GApps/Error.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Error extends \Zend\GData\App\AbstractBase
 {
diff --git a/library/Zend/GData/GApps/Extension/EmailList.php b/library/Zend/GData/GApps/Extension/EmailList.php
index 34caa58dfaf..b02725eca99 100644
--- a/library/Zend/GData/GApps/Extension/EmailList.php
+++ b/library/Zend/GData/GApps/Extension/EmailList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailList extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/GApps/Extension/Login.php b/library/Zend/GData/GApps/Extension/Login.php
index 98b283bc6d2..23f6bc08907 100644
--- a/library/Zend/GData/GApps/Extension/Login.php
+++ b/library/Zend/GData/GApps/Extension/Login.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps\Extension;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Login extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/GApps/Extension/Name.php b/library/Zend/GData/GApps/Extension/Name.php
index ad64d133d1d..e63536e26db 100644
--- a/library/Zend/GData/GApps/Extension/Name.php
+++ b/library/Zend/GData/GApps/Extension/Name.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Name extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/GApps/Extension/Nickname.php b/library/Zend/GData/GApps/Extension/Nickname.php
index 1a4e1d6d7db..386d13abc49 100644
--- a/library/Zend/GData/GApps/Extension/Nickname.php
+++ b/library/Zend/GData/GApps/Extension/Nickname.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Nickname extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/GApps/Extension/Property.php b/library/Zend/GData/GApps/Extension/Property.php
index e1bf8bd5b19..e489158158f 100644
--- a/library/Zend/GData/GApps/Extension/Property.php
+++ b/library/Zend/GData/GApps/Extension/Property.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Property extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/GApps/Extension/Quota.php b/library/Zend/GData/GApps/Extension/Quota.php
index b41b22a7611..f9d1c980ed8 100644
--- a/library/Zend/GData/GApps/Extension/Quota.php
+++ b/library/Zend/GData/GApps/Extension/Quota.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps\Extension;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Quota extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/GApps/GroupEntry.php b/library/Zend/GData/GApps/GroupEntry.php
index d305e56b275..0f82a9eee8c 100644
--- a/library/Zend/GData/GApps/GroupEntry.php
+++ b/library/Zend/GData/GApps/GroupEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -39,8 +37,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GroupEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/GApps/GroupFeed.php b/library/Zend/GData/GApps/GroupFeed.php
index 24e85a51b76..90e6aaa42a9 100644
--- a/library/Zend/GData/GApps/GroupFeed.php
+++ b/library/Zend/GData/GApps/GroupFeed.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GroupFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/GApps/GroupQuery.php b/library/Zend/GData/GApps/GroupQuery.php
index ca55743575e..ddbb20ec227 100644
--- a/library/Zend/GData/GApps/GroupQuery.php
+++ b/library/Zend/GData/GApps/GroupQuery.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -36,8 +34,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GroupQuery extends AbstractQuery
 {
diff --git a/library/Zend/GData/GApps/MemberEntry.php b/library/Zend/GData/GApps/MemberEntry.php
index 09f7c4d81ee..40a8bbc40d0 100644
--- a/library/Zend/GData/GApps/MemberEntry.php
+++ b/library/Zend/GData/GApps/MemberEntry.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -40,8 +38,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MemberEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/GApps/MemberFeed.php b/library/Zend/GData/GApps/MemberFeed.php
index e9e67910d8e..4583b9a0464 100644
--- a/library/Zend/GData/GApps/MemberFeed.php
+++ b/library/Zend/GData/GApps/MemberFeed.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MemberFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/GApps/MemberQuery.php b/library/Zend/GData/GApps/MemberQuery.php
index 12b878d2367..77119c44d73 100644
--- a/library/Zend/GData/GApps/MemberQuery.php
+++ b/library/Zend/GData/GApps/MemberQuery.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -36,8 +34,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MemberQuery extends AbstractQuery
 {
diff --git a/library/Zend/GData/GApps/NicknameEntry.php b/library/Zend/GData/GApps/NicknameEntry.php
index 77e5f109b41..5a8c5ef2fd6 100644
--- a/library/Zend/GData/GApps/NicknameEntry.php
+++ b/library/Zend/GData/GApps/NicknameEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -40,8 +38,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NicknameEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/GApps/NicknameFeed.php b/library/Zend/GData/GApps/NicknameFeed.php
index 83da5bd5aa9..6c41c6350d1 100644
--- a/library/Zend/GData/GApps/NicknameFeed.php
+++ b/library/Zend/GData/GApps/NicknameFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NicknameFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/GApps/NicknameQuery.php b/library/Zend/GData/GApps/NicknameQuery.php
index 952040b48e8..dad3cded09d 100644
--- a/library/Zend/GData/GApps/NicknameQuery.php
+++ b/library/Zend/GData/GApps/NicknameQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NicknameQuery extends AbstractQuery
 {
diff --git a/library/Zend/GData/GApps/OwnerEntry.php b/library/Zend/GData/GApps/OwnerEntry.php
index 3a1eb0576e9..d0bf7233da4 100644
--- a/library/Zend/GData/GApps/OwnerEntry.php
+++ b/library/Zend/GData/GApps/OwnerEntry.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -40,8 +38,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OwnerEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/GApps/OwnerFeed.php b/library/Zend/GData/GApps/OwnerFeed.php
index b3ab5573557..19a07e94d8a 100644
--- a/library/Zend/GData/GApps/OwnerFeed.php
+++ b/library/Zend/GData/GApps/OwnerFeed.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OwnerFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/GApps/OwnerQuery.php b/library/Zend/GData/GApps/OwnerQuery.php
index 27f2464e5a0..8d0c9709be0 100644
--- a/library/Zend/GData/GApps/OwnerQuery.php
+++ b/library/Zend/GData/GApps/OwnerQuery.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id:$
  */
 
@@ -37,8 +35,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OwnerQuery extends AbstractQuery
 {
diff --git a/library/Zend/GData/GApps/ServiceException.php b/library/Zend/GData/GApps/ServiceException.php
index e6e6134b01c..fda90be4039 100644
--- a/library/Zend/GData/GApps/ServiceException.php
+++ b/library/Zend/GData/GApps/ServiceException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServiceException extends \Exception
 {
diff --git a/library/Zend/GData/GApps/UserEntry.php b/library/Zend/GData/GApps/UserEntry.php
index db7f3dd5056..4b656de3c08 100644
--- a/library/Zend/GData/GApps/UserEntry.php
+++ b/library/Zend/GData/GApps/UserEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -38,8 +36,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/GApps/UserFeed.php b/library/Zend/GData/GApps/UserFeed.php
index 53e665b1dce..8d843166566 100644
--- a/library/Zend/GData/GApps/UserFeed.php
+++ b/library/Zend/GData/GApps/UserFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/GApps/UserQuery.php b/library/Zend/GData/GApps/UserQuery.php
index 4ad528a6f09..6a71ec1cc44 100644
--- a/library/Zend/GData/GApps/UserQuery.php
+++ b/library/Zend/GData/GApps/UserQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\GApps;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage GApps
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserQuery extends AbstractQuery
 {
diff --git a/library/Zend/GData/GData.php b/library/Zend/GData/GData.php
index 9c5adfcd1c9..bf0130b2dc9 100644
--- a/library/Zend/GData/GData.php
+++ b/library/Zend/GData/GData.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GData extends App
 {
diff --git a/library/Zend/GData/Geo.php b/library/Zend/GData/Geo.php
index a3c367bdf7b..5eb8ffac175 100644
--- a/library/Zend/GData/Geo.php
+++ b/library/Zend/GData/Geo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Geo extends GData
 {
diff --git a/library/Zend/GData/Geo/Entry.php b/library/Zend/GData/Geo/Entry.php
index f64fc20d4f5..53268dc3ba2 100644
--- a/library/Zend/GData/Geo/Entry.php
+++ b/library/Zend/GData/Geo/Entry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Geo;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Entry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Geo/Extension/GeoRssWhere.php b/library/Zend/GData/Geo/Extension/GeoRssWhere.php
index 25e1af54fcf..3708798329a 100644
--- a/library/Zend/GData/Geo/Extension/GeoRssWhere.php
+++ b/library/Zend/GData/Geo/Extension/GeoRssWhere.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Geo\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GeoRssWhere extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Geo/Extension/GmlPoint.php b/library/Zend/GData/Geo/Extension/GmlPoint.php
index 553a201b816..b8ee037dcd3 100644
--- a/library/Zend/GData/Geo/Extension/GmlPoint.php
+++ b/library/Zend/GData/Geo/Extension/GmlPoint.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Geo\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GmlPoint extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Geo/Extension/GmlPos.php b/library/Zend/GData/Geo/Extension/GmlPos.php
index e862d3fc374..59e9d69fa31 100644
--- a/library/Zend/GData/Geo/Extension/GmlPos.php
+++ b/library/Zend/GData/Geo/Extension/GmlPos.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Geo\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GmlPos extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Geo/Feed.php b/library/Zend/GData/Geo/Feed.php
index 72e08249b48..591864c8524 100644
--- a/library/Zend/GData/Geo/Feed.php
+++ b/library/Zend/GData/Geo/Feed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Geo;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/HttpAdapterStreamingProxy.php b/library/Zend/GData/HttpAdapterStreamingProxy.php
index 9b261f49c06..47200d2ea91 100644
--- a/library/Zend/GData/HttpAdapterStreamingProxy.php
+++ b/library/Zend/GData/HttpAdapterStreamingProxy.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpAdapterStreamingProxy extends Adapter\Proxy
 {
diff --git a/library/Zend/GData/HttpAdapterStreamingSocket.php b/library/Zend/GData/HttpAdapterStreamingSocket.php
index bb462893f5c..c0c7e1b2e81 100644
--- a/library/Zend/GData/HttpAdapterStreamingSocket.php
+++ b/library/Zend/GData/HttpAdapterStreamingSocket.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpAdapterStreamingSocket extends Adapter\Socket
 {
diff --git a/library/Zend/GData/HttpClient.php b/library/Zend/GData/HttpClient.php
index 2ffe658610f..97cdb2037ce 100644
--- a/library/Zend/GData/HttpClient.php
+++ b/library/Zend/GData/HttpClient.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpClient extends Http\Client
 {
diff --git a/library/Zend/GData/Kind/EventEntry.php b/library/Zend/GData/Kind/EventEntry.php
index 9e82b909484..d2bb8f03668 100644
--- a/library/Zend/GData/Kind/EventEntry.php
+++ b/library/Zend/GData/Kind/EventEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Kind;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EventEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Media.php b/library/Zend/GData/Media.php
index 5bf76c555a7..7084c3e6b1c 100644
--- a/library/Zend/GData/Media.php
+++ b/library/Zend/GData/Media.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Media extends GData
 {
diff --git a/library/Zend/GData/Media/Entry.php b/library/Zend/GData/Media/Entry.php
index 2af5df748c1..b9677cfaa81 100644
--- a/library/Zend/GData/Media/Entry.php
+++ b/library/Zend/GData/Media/Entry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Entry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Media/Extension/MediaCategory.php b/library/Zend/GData/Media/Extension/MediaCategory.php
index d4bc0d51a64..e99231234ea 100644
--- a/library/Zend/GData/Media/Extension/MediaCategory.php
+++ b/library/Zend/GData/Media/Extension/MediaCategory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaCategory extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaContent.php b/library/Zend/GData/Media/Extension/MediaContent.php
index dc9f8d7235c..4c8b844eee7 100644
--- a/library/Zend/GData/Media/Extension/MediaContent.php
+++ b/library/Zend/GData/Media/Extension/MediaContent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaContent extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaCopyright.php b/library/Zend/GData/Media/Extension/MediaCopyright.php
index c4c0cb2435c..4edf1f112e5 100644
--- a/library/Zend/GData/Media/Extension/MediaCopyright.php
+++ b/library/Zend/GData/Media/Extension/MediaCopyright.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaCopyright extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaCredit.php b/library/Zend/GData/Media/Extension/MediaCredit.php
index 0a1057b0dad..bc8651546d7 100644
--- a/library/Zend/GData/Media/Extension/MediaCredit.php
+++ b/library/Zend/GData/Media/Extension/MediaCredit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaCredit extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaDescription.php b/library/Zend/GData/Media/Extension/MediaDescription.php
index df66a334e19..fcbfb469be9 100644
--- a/library/Zend/GData/Media/Extension/MediaDescription.php
+++ b/library/Zend/GData/Media/Extension/MediaDescription.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaDescription extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaGroup.php b/library/Zend/GData/Media/Extension/MediaGroup.php
index 68942cd1e50..956c3a5fa8f 100644
--- a/library/Zend/GData/Media/Extension/MediaGroup.php
+++ b/library/Zend/GData/Media/Extension/MediaGroup.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaGroup extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaHash.php b/library/Zend/GData/Media/Extension/MediaHash.php
index 616b841de20..2d021259179 100644
--- a/library/Zend/GData/Media/Extension/MediaHash.php
+++ b/library/Zend/GData/Media/Extension/MediaHash.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaHash extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaKeywords.php b/library/Zend/GData/Media/Extension/MediaKeywords.php
index 47d716e0494..e3951a5f258 100644
--- a/library/Zend/GData/Media/Extension/MediaKeywords.php
+++ b/library/Zend/GData/Media/Extension/MediaKeywords.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaKeywords extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaPlayer.php b/library/Zend/GData/Media/Extension/MediaPlayer.php
index 040ecf48726..58ae19a2ce1 100644
--- a/library/Zend/GData/Media/Extension/MediaPlayer.php
+++ b/library/Zend/GData/Media/Extension/MediaPlayer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaPlayer extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaRating.php b/library/Zend/GData/Media/Extension/MediaRating.php
index 89d452e8626..5bb7de6b85f 100644
--- a/library/Zend/GData/Media/Extension/MediaRating.php
+++ b/library/Zend/GData/Media/Extension/MediaRating.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaRating extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaRestriction.php b/library/Zend/GData/Media/Extension/MediaRestriction.php
index 66b6a4b3476..4de909bb096 100644
--- a/library/Zend/GData/Media/Extension/MediaRestriction.php
+++ b/library/Zend/GData/Media/Extension/MediaRestriction.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaRestriction extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaText.php b/library/Zend/GData/Media/Extension/MediaText.php
index 20b3660f640..db462b59e25 100644
--- a/library/Zend/GData/Media/Extension/MediaText.php
+++ b/library/Zend/GData/Media/Extension/MediaText.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaText extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaThumbnail.php b/library/Zend/GData/Media/Extension/MediaThumbnail.php
index 83030fe4353..57277389ca5 100644
--- a/library/Zend/GData/Media/Extension/MediaThumbnail.php
+++ b/library/Zend/GData/Media/Extension/MediaThumbnail.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaThumbnail extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Extension/MediaTitle.php b/library/Zend/GData/Media/Extension/MediaTitle.php
index fba9cafac05..cf286acec8c 100644
--- a/library/Zend/GData/Media/Extension/MediaTitle.php
+++ b/library/Zend/GData/Media/Extension/MediaTitle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaTitle extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Media/Feed.php b/library/Zend/GData/Media/Feed.php
index f1ed531cb6f..1044a64cdfb 100644
--- a/library/Zend/GData/Media/Feed.php
+++ b/library/Zend/GData/Media/Feed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Media;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/MediaMimeStream.php b/library/Zend/GData/MediaMimeStream.php
index 1e242f24564..0a57fa8c04d 100644
--- a/library/Zend/GData/MediaMimeStream.php
+++ b/library/Zend/GData/MediaMimeStream.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaMimeStream
 {
diff --git a/library/Zend/GData/MimeBodyString.php b/library/Zend/GData/MimeBodyString.php
index 1e3df24d830..5a352c09fe4 100644
--- a/library/Zend/GData/MimeBodyString.php
+++ b/library/Zend/GData/MimeBodyString.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MimeBodyString
 {
diff --git a/library/Zend/GData/MimeFile.php b/library/Zend/GData/MimeFile.php
index a73a8278c31..5f8c17f59b1 100644
--- a/library/Zend/GData/MimeFile.php
+++ b/library/Zend/GData/MimeFile.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MimeFile
 {
diff --git a/library/Zend/GData/Photos.php b/library/Zend/GData/Photos.php
index b54f15c99e7..c263427f4e7 100644
--- a/library/Zend/GData/Photos.php
+++ b/library/Zend/GData/Photos.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Photos extends GData
 {
diff --git a/library/Zend/GData/Photos/AlbumEntry.php b/library/Zend/GData/Photos/AlbumEntry.php
index fb396d270ea..fd6e30eb1f2 100644
--- a/library/Zend/GData/Photos/AlbumEntry.php
+++ b/library/Zend/GData/Photos/AlbumEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AlbumEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Photos/AlbumFeed.php b/library/Zend/GData/Photos/AlbumFeed.php
index ba4fac5d2cb..10a8cbea99b 100644
--- a/library/Zend/GData/Photos/AlbumFeed.php
+++ b/library/Zend/GData/Photos/AlbumFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AlbumFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Photos/AlbumQuery.php b/library/Zend/GData/Photos/AlbumQuery.php
index 37563fcc60b..718f8869926 100644
--- a/library/Zend/GData/Photos/AlbumQuery.php
+++ b/library/Zend/GData/Photos/AlbumQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AlbumQuery extends UserQuery
 {
diff --git a/library/Zend/GData/Photos/CommentEntry.php b/library/Zend/GData/Photos/CommentEntry.php
index 269c3cf5a37..f36a19827c8 100644
--- a/library/Zend/GData/Photos/CommentEntry.php
+++ b/library/Zend/GData/Photos/CommentEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CommentEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Photos/Extension/Access.php b/library/Zend/GData/Photos/Extension/Access.php
index 2d6b3b3987e..9959356de76 100644
--- a/library/Zend/GData/Photos/Extension/Access.php
+++ b/library/Zend/GData/Photos/Extension/Access.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Access extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/AlbumId.php b/library/Zend/GData/Photos/Extension/AlbumId.php
index b517b016989..10c6cafa8db 100644
--- a/library/Zend/GData/Photos/Extension/AlbumId.php
+++ b/library/Zend/GData/Photos/Extension/AlbumId.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AlbumId extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/BytesUsed.php b/library/Zend/GData/Photos/Extension/BytesUsed.php
index d085ce3adc5..b1e53045ccb 100644
--- a/library/Zend/GData/Photos/Extension/BytesUsed.php
+++ b/library/Zend/GData/Photos/Extension/BytesUsed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BytesUsed extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Checksum.php b/library/Zend/GData/Photos/Extension/Checksum.php
index 6d2f62aa83a..32812cce016 100644
--- a/library/Zend/GData/Photos/Extension/Checksum.php
+++ b/library/Zend/GData/Photos/Extension/Checksum.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Checksum extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Client.php b/library/Zend/GData/Photos/Extension/Client.php
index e085f3e88c7..06553341ba5 100644
--- a/library/Zend/GData/Photos/Extension/Client.php
+++ b/library/Zend/GData/Photos/Extension/Client.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Client extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/CommentCount.php b/library/Zend/GData/Photos/Extension/CommentCount.php
index 7d292ceea49..42e75238f67 100644
--- a/library/Zend/GData/Photos/Extension/CommentCount.php
+++ b/library/Zend/GData/Photos/Extension/CommentCount.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CommentCount extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/CommentingEnabled.php b/library/Zend/GData/Photos/Extension/CommentingEnabled.php
index 70ef95b15a4..0fb3d00e46b 100644
--- a/library/Zend/GData/Photos/Extension/CommentingEnabled.php
+++ b/library/Zend/GData/Photos/Extension/CommentingEnabled.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CommentingEnabled extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Height.php b/library/Zend/GData/Photos/Extension/Height.php
index 37dd3046aa0..36f4e08eb44 100644
--- a/library/Zend/GData/Photos/Extension/Height.php
+++ b/library/Zend/GData/Photos/Extension/Height.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Height extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Id.php b/library/Zend/GData/Photos/Extension/Id.php
index 05c70e03279..9301ef898a4 100644
--- a/library/Zend/GData/Photos/Extension/Id.php
+++ b/library/Zend/GData/Photos/Extension/Id.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Id extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Location.php b/library/Zend/GData/Photos/Extension/Location.php
index 5b2e02b79f7..857089298ab 100644
--- a/library/Zend/GData/Photos/Extension/Location.php
+++ b/library/Zend/GData/Photos/Extension/Location.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Location extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/MaxPhotosPerAlbum.php b/library/Zend/GData/Photos/Extension/MaxPhotosPerAlbum.php
index f42d47ed68a..4364d1e7669 100644
--- a/library/Zend/GData/Photos/Extension/MaxPhotosPerAlbum.php
+++ b/library/Zend/GData/Photos/Extension/MaxPhotosPerAlbum.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MaxPhotosPerAlbum extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Name.php b/library/Zend/GData/Photos/Extension/Name.php
index cab1e8098bb..ad6d934e4d2 100644
--- a/library/Zend/GData/Photos/Extension/Name.php
+++ b/library/Zend/GData/Photos/Extension/Name.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Name extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Nickname.php b/library/Zend/GData/Photos/Extension/Nickname.php
index 4a774b26762..21444dab5db 100644
--- a/library/Zend/GData/Photos/Extension/Nickname.php
+++ b/library/Zend/GData/Photos/Extension/Nickname.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Nickname extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/NumPhotos.php b/library/Zend/GData/Photos/Extension/NumPhotos.php
index cabfff09ff1..e24f40219f5 100644
--- a/library/Zend/GData/Photos/Extension/NumPhotos.php
+++ b/library/Zend/GData/Photos/Extension/NumPhotos.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumPhotos extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/NumPhotosRemaining.php b/library/Zend/GData/Photos/Extension/NumPhotosRemaining.php
index 8bb5dde5cef..dcf30eb51df 100644
--- a/library/Zend/GData/Photos/Extension/NumPhotosRemaining.php
+++ b/library/Zend/GData/Photos/Extension/NumPhotosRemaining.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumPhotosRemaining extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/PhotoId.php b/library/Zend/GData/Photos/Extension/PhotoId.php
index 764fc8c2f55..d5910192418 100644
--- a/library/Zend/GData/Photos/Extension/PhotoId.php
+++ b/library/Zend/GData/Photos/Extension/PhotoId.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhotoId extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Position.php b/library/Zend/GData/Photos/Extension/Position.php
index 7d21f281921..04f1086f836 100644
--- a/library/Zend/GData/Photos/Extension/Position.php
+++ b/library/Zend/GData/Photos/Extension/Position.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Position extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/QuotaCurrent.php b/library/Zend/GData/Photos/Extension/QuotaCurrent.php
index a7f770d99c7..7e07eee8f17 100644
--- a/library/Zend/GData/Photos/Extension/QuotaCurrent.php
+++ b/library/Zend/GData/Photos/Extension/QuotaCurrent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QuotaCurrent extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/QuotaLimit.php b/library/Zend/GData/Photos/Extension/QuotaLimit.php
index 6e333eff692..1fe2af3735f 100644
--- a/library/Zend/GData/Photos/Extension/QuotaLimit.php
+++ b/library/Zend/GData/Photos/Extension/QuotaLimit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QuotaLimit extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Rotation.php b/library/Zend/GData/Photos/Extension/Rotation.php
index dac1f7ec406..805f1c7185f 100644
--- a/library/Zend/GData/Photos/Extension/Rotation.php
+++ b/library/Zend/GData/Photos/Extension/Rotation.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rotation extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Size.php b/library/Zend/GData/Photos/Extension/Size.php
index 90478a32751..4c507afaa5f 100644
--- a/library/Zend/GData/Photos/Extension/Size.php
+++ b/library/Zend/GData/Photos/Extension/Size.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Size extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Thumbnail.php b/library/Zend/GData/Photos/Extension/Thumbnail.php
index 3bc03db2f7e..23d526d8fc7 100644
--- a/library/Zend/GData/Photos/Extension/Thumbnail.php
+++ b/library/Zend/GData/Photos/Extension/Thumbnail.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Thumbnail extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Timestamp.php b/library/Zend/GData/Photos/Extension/Timestamp.php
index 93b0f9e0db8..675aab2f81e 100644
--- a/library/Zend/GData/Photos/Extension/Timestamp.php
+++ b/library/Zend/GData/Photos/Extension/Timestamp.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Timestamp extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/User.php b/library/Zend/GData/Photos/Extension/User.php
index 4bb1db0a4ec..27be50cbacc 100644
--- a/library/Zend/GData/Photos/Extension/User.php
+++ b/library/Zend/GData/Photos/Extension/User.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class User extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Version.php b/library/Zend/GData/Photos/Extension/Version.php
index b0a8f9540ae..f7f99088b9e 100644
--- a/library/Zend/GData/Photos/Extension/Version.php
+++ b/library/Zend/GData/Photos/Extension/Version.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Version extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Weight.php b/library/Zend/GData/Photos/Extension/Weight.php
index f13a764735c..a4e77f0ed0b 100644
--- a/library/Zend/GData/Photos/Extension/Weight.php
+++ b/library/Zend/GData/Photos/Extension/Weight.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Weight extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/Extension/Width.php b/library/Zend/GData/Photos/Extension/Width.php
index 8ba1abf54f7..eb557704ed4 100644
--- a/library/Zend/GData/Photos/Extension/Width.php
+++ b/library/Zend/GData/Photos/Extension/Width.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos\Extension;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Width extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Photos/PhotoEntry.php b/library/Zend/GData/Photos/PhotoEntry.php
index 060dbaef835..4b8c299aed0 100644
--- a/library/Zend/GData/Photos/PhotoEntry.php
+++ b/library/Zend/GData/Photos/PhotoEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhotoEntry extends \Zend\GData\Media\Entry
 {
diff --git a/library/Zend/GData/Photos/PhotoFeed.php b/library/Zend/GData/Photos/PhotoFeed.php
index a84ce3a2934..f5c32ebd298 100644
--- a/library/Zend/GData/Photos/PhotoFeed.php
+++ b/library/Zend/GData/Photos/PhotoFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhotoFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Photos/PhotoQuery.php b/library/Zend/GData/Photos/PhotoQuery.php
index 54a4def9f3a..211c182f303 100644
--- a/library/Zend/GData/Photos/PhotoQuery.php
+++ b/library/Zend/GData/Photos/PhotoQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhotoQuery extends AlbumQuery
 {
diff --git a/library/Zend/GData/Photos/TagEntry.php b/library/Zend/GData/Photos/TagEntry.php
index c08bf633c4f..bf9dfdbdd3c 100644
--- a/library/Zend/GData/Photos/TagEntry.php
+++ b/library/Zend/GData/Photos/TagEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TagEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Photos/UserEntry.php b/library/Zend/GData/Photos/UserEntry.php
index 882e93e782e..c56850a3d58 100644
--- a/library/Zend/GData/Photos/UserEntry.php
+++ b/library/Zend/GData/Photos/UserEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Photos/UserFeed.php b/library/Zend/GData/Photos/UserFeed.php
index 067f2f9a4c2..be7184cef31 100644
--- a/library/Zend/GData/Photos/UserFeed.php
+++ b/library/Zend/GData/Photos/UserFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Photos/UserQuery.php b/library/Zend/GData/Photos/UserQuery.php
index 6b693f0feaf..291388ff50c 100644
--- a/library/Zend/GData/Photos/UserQuery.php
+++ b/library/Zend/GData/Photos/UserQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Photos;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserQuery extends \Zend\GData\Query
 {
diff --git a/library/Zend/GData/Query.php b/library/Zend/GData/Query.php
index a402a957ebb..96282b5560a 100644
--- a/library/Zend/GData/Query.php
+++ b/library/Zend/GData/Query.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Query
 {
diff --git a/library/Zend/GData/Spreadsheets.php b/library/Zend/GData/Spreadsheets.php
index 23e3e8fb955..43b699d4a3d 100644
--- a/library/Zend/GData/Spreadsheets.php
+++ b/library/Zend/GData/Spreadsheets.php
@@ -15,8 +15,6 @@
  * @category     Zend
  * @package      Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Spreadsheets extends GData
 {
diff --git a/library/Zend/GData/Spreadsheets/CellEntry.php b/library/Zend/GData/Spreadsheets/CellEntry.php
index afcefeb89ef..4d67850abe4 100644
--- a/library/Zend/GData/Spreadsheets/CellEntry.php
+++ b/library/Zend/GData/Spreadsheets/CellEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CellEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Spreadsheets/CellFeed.php b/library/Zend/GData/Spreadsheets/CellFeed.php
index 50e530ca279..4379f4d0ec7 100644
--- a/library/Zend/GData/Spreadsheets/CellFeed.php
+++ b/library/Zend/GData/Spreadsheets/CellFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CellFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Spreadsheets/CellQuery.php b/library/Zend/GData/Spreadsheets/CellQuery.php
index 7bf9e1e915a..ce8188a0117 100644
--- a/library/Zend/GData/Spreadsheets/CellQuery.php
+++ b/library/Zend/GData/Spreadsheets/CellQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CellQuery extends \Zend\GData\Query
 {
diff --git a/library/Zend/GData/Spreadsheets/DocumentQuery.php b/library/Zend/GData/Spreadsheets/DocumentQuery.php
index d010a2840fa..e6cef18e973 100644
--- a/library/Zend/GData/Spreadsheets/DocumentQuery.php
+++ b/library/Zend/GData/Spreadsheets/DocumentQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentQuery extends \Zend\GData\Query
 {
diff --git a/library/Zend/GData/Spreadsheets/Extension/Cell.php b/library/Zend/GData/Spreadsheets/Extension/Cell.php
index 63604dda5ec..8bab5ef7c24 100644
--- a/library/Zend/GData/Spreadsheets/Extension/Cell.php
+++ b/library/Zend/GData/Spreadsheets/Extension/Cell.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cell extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Spreadsheets/Extension/ColCount.php b/library/Zend/GData/Spreadsheets/Extension/ColCount.php
index a88803d4a80..dbe192e2f82 100644
--- a/library/Zend/GData/Spreadsheets/Extension/ColCount.php
+++ b/library/Zend/GData/Spreadsheets/Extension/ColCount.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ColCount extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Spreadsheets/Extension/Custom.php b/library/Zend/GData/Spreadsheets/Extension/Custom.php
index 70cd4609799..d62b27004a5 100644
--- a/library/Zend/GData/Spreadsheets/Extension/Custom.php
+++ b/library/Zend/GData/Spreadsheets/Extension/Custom.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Custom extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Spreadsheets/Extension/RowCount.php b/library/Zend/GData/Spreadsheets/Extension/RowCount.php
index 322df5f8c4f..45746f4ea10 100644
--- a/library/Zend/GData/Spreadsheets/Extension/RowCount.php
+++ b/library/Zend/GData/Spreadsheets/Extension/RowCount.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RowCount extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/Spreadsheets/ListEntry.php b/library/Zend/GData/Spreadsheets/ListEntry.php
index 74bbc511a6e..b6d7e9ccd40 100644
--- a/library/Zend/GData/Spreadsheets/ListEntry.php
+++ b/library/Zend/GData/Spreadsheets/ListEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ListEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Spreadsheets/ListFeed.php b/library/Zend/GData/Spreadsheets/ListFeed.php
index 73da69ae64d..fdb214c5260 100644
--- a/library/Zend/GData/Spreadsheets/ListFeed.php
+++ b/library/Zend/GData/Spreadsheets/ListFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ListFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Spreadsheets/ListQuery.php b/library/Zend/GData/Spreadsheets/ListQuery.php
index 5a7a307cc1c..2bd63576e4f 100644
--- a/library/Zend/GData/Spreadsheets/ListQuery.php
+++ b/library/Zend/GData/Spreadsheets/ListQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ListQuery extends \Zend\GData\Query
 {
diff --git a/library/Zend/GData/Spreadsheets/SpreadsheetEntry.php b/library/Zend/GData/Spreadsheets/SpreadsheetEntry.php
index 6c45bac0e7c..4b28d8707df 100644
--- a/library/Zend/GData/Spreadsheets/SpreadsheetEntry.php
+++ b/library/Zend/GData/Spreadsheets/SpreadsheetEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SpreadsheetEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Spreadsheets/SpreadsheetFeed.php b/library/Zend/GData/Spreadsheets/SpreadsheetFeed.php
index e9eedd2ada0..7ed5e870106 100644
--- a/library/Zend/GData/Spreadsheets/SpreadsheetFeed.php
+++ b/library/Zend/GData/Spreadsheets/SpreadsheetFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SpreadsheetFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/Spreadsheets/WorksheetEntry.php b/library/Zend/GData/Spreadsheets/WorksheetEntry.php
index ef5585c1a0e..59cc596bae5 100644
--- a/library/Zend/GData/Spreadsheets/WorksheetEntry.php
+++ b/library/Zend/GData/Spreadsheets/WorksheetEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WorksheetEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/Spreadsheets/WorksheetFeed.php b/library/Zend/GData/Spreadsheets/WorksheetFeed.php
index a256b977165..b3c8a02b76c 100644
--- a/library/Zend/GData/Spreadsheets/WorksheetFeed.php
+++ b/library/Zend/GData/Spreadsheets/WorksheetFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\Spreadsheets;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WorksheetFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/YouTube.php b/library/Zend/GData/YouTube.php
index f9c443555a7..1161480da27 100644
--- a/library/Zend/GData/YouTube.php
+++ b/library/Zend/GData/YouTube.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class YouTube extends Media
 {
diff --git a/library/Zend/GData/YouTube/ActivityEntry.php b/library/Zend/GData/YouTube/ActivityEntry.php
index 0d6881c2687..d1b292b5ec6 100644
--- a/library/Zend/GData/YouTube/ActivityEntry.php
+++ b/library/Zend/GData/YouTube/ActivityEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ActivityEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/YouTube/ActivityFeed.php b/library/Zend/GData/YouTube/ActivityFeed.php
index 89ca6917a15..c3661266e21 100644
--- a/library/Zend/GData/YouTube/ActivityFeed.php
+++ b/library/Zend/GData/YouTube/ActivityFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ActivityFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/YouTube/CommentEntry.php b/library/Zend/GData/YouTube/CommentEntry.php
index 007a1d77f01..2cf0756930c 100644
--- a/library/Zend/GData/YouTube/CommentEntry.php
+++ b/library/Zend/GData/YouTube/CommentEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CommentEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/YouTube/CommentFeed.php b/library/Zend/GData/YouTube/CommentFeed.php
index 77d3b8fb7d2..a9c33b8558d 100644
--- a/library/Zend/GData/YouTube/CommentFeed.php
+++ b/library/Zend/GData/YouTube/CommentFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CommentFeed extends \Zend\GData\Feed
 {
diff --git a/library/Zend/GData/YouTube/ContactEntry.php b/library/Zend/GData/YouTube/ContactEntry.php
index 540b12d1eb9..87914aa9f14 100644
--- a/library/Zend/GData/YouTube/ContactEntry.php
+++ b/library/Zend/GData/YouTube/ContactEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ContactEntry extends UserProfileEntry
 {
diff --git a/library/Zend/GData/YouTube/ContactFeed.php b/library/Zend/GData/YouTube/ContactFeed.php
index 44b661b70f1..f22364e5041 100644
--- a/library/Zend/GData/YouTube/ContactFeed.php
+++ b/library/Zend/GData/YouTube/ContactFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ContactFeed extends \Zend\GData\Media\Feed
 {
diff --git a/library/Zend/GData/YouTube/Extension/AboutMe.php b/library/Zend/GData/YouTube/Extension/AboutMe.php
index 471dcb70469..d40028354f1 100644
--- a/library/Zend/GData/YouTube/Extension/AboutMe.php
+++ b/library/Zend/GData/YouTube/Extension/AboutMe.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AboutMe extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Age.php b/library/Zend/GData/YouTube/Extension/Age.php
index 75d4cc014ec..1475dc00acf 100644
--- a/library/Zend/GData/YouTube/Extension/Age.php
+++ b/library/Zend/GData/YouTube/Extension/Age.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Age extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Books.php b/library/Zend/GData/YouTube/Extension/Books.php
index ee4a8dcb727..e613f259db0 100644
--- a/library/Zend/GData/YouTube/Extension/Books.php
+++ b/library/Zend/GData/YouTube/Extension/Books.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Books extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Company.php b/library/Zend/GData/YouTube/Extension/Company.php
index 85274eb2bca..2179e3dbf3b 100644
--- a/library/Zend/GData/YouTube/Extension/Company.php
+++ b/library/Zend/GData/YouTube/Extension/Company.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Company extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Control.php b/library/Zend/GData/YouTube/Extension/Control.php
index de96afc0b47..89bb4e0b6ee 100644
--- a/library/Zend/GData/YouTube/Extension/Control.php
+++ b/library/Zend/GData/YouTube/Extension/Control.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Control extends \Zend\GData\App\Extension\Control
 {
diff --git a/library/Zend/GData/YouTube/Extension/CountHint.php b/library/Zend/GData/YouTube/Extension/CountHint.php
index b46b5f9df8a..a0d9d97d09e 100644
--- a/library/Zend/GData/YouTube/Extension/CountHint.php
+++ b/library/Zend/GData/YouTube/Extension/CountHint.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CountHint extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Description.php b/library/Zend/GData/YouTube/Extension/Description.php
index d4c9b580ea7..6d930947c40 100644
--- a/library/Zend/GData/YouTube/Extension/Description.php
+++ b/library/Zend/GData/YouTube/Extension/Description.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Description extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Duration.php b/library/Zend/GData/YouTube/Extension/Duration.php
index 7ac0a7fa909..2fdf41f9a67 100644
--- a/library/Zend/GData/YouTube/Extension/Duration.php
+++ b/library/Zend/GData/YouTube/Extension/Duration.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Duration extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/FirstName.php b/library/Zend/GData/YouTube/Extension/FirstName.php
index 5be55d18142..1f6c53e7e57 100644
--- a/library/Zend/GData/YouTube/Extension/FirstName.php
+++ b/library/Zend/GData/YouTube/Extension/FirstName.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FirstName extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Gender.php b/library/Zend/GData/YouTube/Extension/Gender.php
index 3830d83c4f6..84fe5c0c5b0 100644
--- a/library/Zend/GData/YouTube/Extension/Gender.php
+++ b/library/Zend/GData/YouTube/Extension/Gender.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Gender extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Hobbies.php b/library/Zend/GData/YouTube/Extension/Hobbies.php
index 29d07660a25..65ad27a4fee 100644
--- a/library/Zend/GData/YouTube/Extension/Hobbies.php
+++ b/library/Zend/GData/YouTube/Extension/Hobbies.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hobbies extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Hometown.php b/library/Zend/GData/YouTube/Extension/Hometown.php
index 4046c260d1e..b523d4c8efb 100644
--- a/library/Zend/GData/YouTube/Extension/Hometown.php
+++ b/library/Zend/GData/YouTube/Extension/Hometown.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hometown extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/LastName.php b/library/Zend/GData/YouTube/Extension/LastName.php
index b2801b4a1dc..f17d5b411fe 100644
--- a/library/Zend/GData/YouTube/Extension/LastName.php
+++ b/library/Zend/GData/YouTube/Extension/LastName.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LastName extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Link.php b/library/Zend/GData/YouTube/Extension/Link.php
index 44e5a4d5d75..13549eec763 100644
--- a/library/Zend/GData/YouTube/Extension/Link.php
+++ b/library/Zend/GData/YouTube/Extension/Link.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Link extends \Zend\GData\App\Extension\Link
 {
diff --git a/library/Zend/GData/YouTube/Extension/Location.php b/library/Zend/GData/YouTube/Extension/Location.php
index dfd6cbd5345..2e10b90d438 100644
--- a/library/Zend/GData/YouTube/Extension/Location.php
+++ b/library/Zend/GData/YouTube/Extension/Location.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Location extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/MediaContent.php b/library/Zend/GData/YouTube/Extension/MediaContent.php
index 049cdfa7510..6bb8ace9726 100644
--- a/library/Zend/GData/YouTube/Extension/MediaContent.php
+++ b/library/Zend/GData/YouTube/Extension/MediaContent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaContent extends \Zend\GData\Media\Extension\MediaContent
 {
diff --git a/library/Zend/GData/YouTube/Extension/MediaCredit.php b/library/Zend/GData/YouTube/Extension/MediaCredit.php
index e45544f14c1..cbb40eff09f 100644
--- a/library/Zend/GData/YouTube/Extension/MediaCredit.php
+++ b/library/Zend/GData/YouTube/Extension/MediaCredit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaCredit extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/MediaGroup.php b/library/Zend/GData/YouTube/Extension/MediaGroup.php
index f59c0c2af37..5a15c036cb7 100644
--- a/library/Zend/GData/YouTube/Extension/MediaGroup.php
+++ b/library/Zend/GData/YouTube/Extension/MediaGroup.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaGroup extends \Zend\GData\Media\Extension\MediaGroup
 {
diff --git a/library/Zend/GData/YouTube/Extension/MediaRating.php b/library/Zend/GData/YouTube/Extension/MediaRating.php
index ff72f622cff..cb8e400ed4d 100644
--- a/library/Zend/GData/YouTube/Extension/MediaRating.php
+++ b/library/Zend/GData/YouTube/Extension/MediaRating.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaRating extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Movies.php b/library/Zend/GData/YouTube/Extension/Movies.php
index 255282f0857..e7043a6b304 100644
--- a/library/Zend/GData/YouTube/Extension/Movies.php
+++ b/library/Zend/GData/YouTube/Extension/Movies.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Movies extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Music.php b/library/Zend/GData/YouTube/Extension/Music.php
index e51a26d5bc7..ac23221f581 100644
--- a/library/Zend/GData/YouTube/Extension/Music.php
+++ b/library/Zend/GData/YouTube/Extension/Music.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Music extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/NoEmbed.php b/library/Zend/GData/YouTube/Extension/NoEmbed.php
index 10b1678436d..634de6698d6 100644
--- a/library/Zend/GData/YouTube/Extension/NoEmbed.php
+++ b/library/Zend/GData/YouTube/Extension/NoEmbed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NoEmbed extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Occupation.php b/library/Zend/GData/YouTube/Extension/Occupation.php
index 5ab0de06a0b..6d2ea5a9baf 100644
--- a/library/Zend/GData/YouTube/Extension/Occupation.php
+++ b/library/Zend/GData/YouTube/Extension/Occupation.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Occupation extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/PlaylistId.php b/library/Zend/GData/YouTube/Extension/PlaylistId.php
index 8253cdee269..dce1dc5264c 100644
--- a/library/Zend/GData/YouTube/Extension/PlaylistId.php
+++ b/library/Zend/GData/YouTube/Extension/PlaylistId.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlaylistId extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/PlaylistTitle.php b/library/Zend/GData/YouTube/Extension/PlaylistTitle.php
index ffded1852b3..5e61213008f 100644
--- a/library/Zend/GData/YouTube/Extension/PlaylistTitle.php
+++ b/library/Zend/GData/YouTube/Extension/PlaylistTitle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlaylistTitle extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Position.php b/library/Zend/GData/YouTube/Extension/Position.php
index 7d97120a687..a9173232b15 100644
--- a/library/Zend/GData/YouTube/Extension/Position.php
+++ b/library/Zend/GData/YouTube/Extension/Position.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Position extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/PrivateExtension.php b/library/Zend/GData/YouTube/Extension/PrivateExtension.php
index 794fa483105..8eb30e83f33 100644
--- a/library/Zend/GData/YouTube/Extension/PrivateExtension.php
+++ b/library/Zend/GData/YouTube/Extension/PrivateExtension.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PrivateExtension extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/QueryString.php b/library/Zend/GData/YouTube/Extension/QueryString.php
index 2e95a6ae09c..12929c8ed9e 100644
--- a/library/Zend/GData/YouTube/Extension/QueryString.php
+++ b/library/Zend/GData/YouTube/Extension/QueryString.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryString extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Racy.php b/library/Zend/GData/YouTube/Extension/Racy.php
index 1faab2c8c5b..e0c74d95198 100644
--- a/library/Zend/GData/YouTube/Extension/Racy.php
+++ b/library/Zend/GData/YouTube/Extension/Racy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Racy extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Recorded.php b/library/Zend/GData/YouTube/Extension/Recorded.php
index d8cfbe46e14..52d3ace4694 100644
--- a/library/Zend/GData/YouTube/Extension/Recorded.php
+++ b/library/Zend/GData/YouTube/Extension/Recorded.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Recorded extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Relationship.php b/library/Zend/GData/YouTube/Extension/Relationship.php
index 80e3386986e..be989324139 100644
--- a/library/Zend/GData/YouTube/Extension/Relationship.php
+++ b/library/Zend/GData/YouTube/Extension/Relationship.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Relationship extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/ReleaseDate.php b/library/Zend/GData/YouTube/Extension/ReleaseDate.php
index 049c4ad88ff..78a86815dc7 100644
--- a/library/Zend/GData/YouTube/Extension/ReleaseDate.php
+++ b/library/Zend/GData/YouTube/Extension/ReleaseDate.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReleaseDate extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/School.php b/library/Zend/GData/YouTube/Extension/School.php
index d48701410de..0053accf37f 100644
--- a/library/Zend/GData/YouTube/Extension/School.php
+++ b/library/Zend/GData/YouTube/Extension/School.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class School extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/State.php b/library/Zend/GData/YouTube/Extension/State.php
index e82f6365b12..2e0a85825ed 100644
--- a/library/Zend/GData/YouTube/Extension/State.php
+++ b/library/Zend/GData/YouTube/Extension/State.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class State extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Statistics.php b/library/Zend/GData/YouTube/Extension/Statistics.php
index ba0896608a6..01cb1bbd4cb 100644
--- a/library/Zend/GData/YouTube/Extension/Statistics.php
+++ b/library/Zend/GData/YouTube/Extension/Statistics.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Statistics extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Status.php b/library/Zend/GData/YouTube/Extension/Status.php
index 3b70b82cafa..073f4987650 100644
--- a/library/Zend/GData/YouTube/Extension/Status.php
+++ b/library/Zend/GData/YouTube/Extension/Status.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Status extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Token.php b/library/Zend/GData/YouTube/Extension/Token.php
index 3585265f3af..6dd5750ac93 100644
--- a/library/Zend/GData/YouTube/Extension/Token.php
+++ b/library/Zend/GData/YouTube/Extension/Token.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Token extends \Zend\GData\App\Extension\AbstractExtension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Uploaded.php b/library/Zend/GData/YouTube/Extension/Uploaded.php
index db380527b25..0c77bfb825f 100644
--- a/library/Zend/GData/YouTube/Extension/Uploaded.php
+++ b/library/Zend/GData/YouTube/Extension/Uploaded.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Uploaded extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/Username.php b/library/Zend/GData/YouTube/Extension/Username.php
index fdc81b1cd8b..0ce1ba2fadd 100644
--- a/library/Zend/GData/YouTube/Extension/Username.php
+++ b/library/Zend/GData/YouTube/Extension/Username.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Username extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/Extension/VideoId.php b/library/Zend/GData/YouTube/Extension/VideoId.php
index f68f71d0678..86bae047217 100644
--- a/library/Zend/GData/YouTube/Extension/VideoId.php
+++ b/library/Zend/GData/YouTube/Extension/VideoId.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube\Extension;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VideoId extends \Zend\GData\Extension
 {
diff --git a/library/Zend/GData/YouTube/InboxEntry.php b/library/Zend/GData/YouTube/InboxEntry.php
index 46b7a72231e..e04cbe86c77 100644
--- a/library/Zend/GData/YouTube/InboxEntry.php
+++ b/library/Zend/GData/YouTube/InboxEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InboxEntry extends \Zend\GData\Media\Entry
 {
diff --git a/library/Zend/GData/YouTube/InboxFeed.php b/library/Zend/GData/YouTube/InboxFeed.php
index 28322f5540e..4c4cea2c331 100644
--- a/library/Zend/GData/YouTube/InboxFeed.php
+++ b/library/Zend/GData/YouTube/InboxFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InboxFeed extends \Zend\GData\Media\Feed
 {
diff --git a/library/Zend/GData/YouTube/MediaEntry.php b/library/Zend/GData/YouTube/MediaEntry.php
index d8852591908..a834499f9bb 100644
--- a/library/Zend/GData/YouTube/MediaEntry.php
+++ b/library/Zend/GData/YouTube/MediaEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MediaEntry extends \Zend\GData\Media\Entry
 {
diff --git a/library/Zend/GData/YouTube/PlaylistListEntry.php b/library/Zend/GData/YouTube/PlaylistListEntry.php
index fa29cf62b85..48e8726027c 100644
--- a/library/Zend/GData/YouTube/PlaylistListEntry.php
+++ b/library/Zend/GData/YouTube/PlaylistListEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlaylistListEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/YouTube/PlaylistListFeed.php b/library/Zend/GData/YouTube/PlaylistListFeed.php
index ad8a03395c8..d87083fe3e2 100644
--- a/library/Zend/GData/YouTube/PlaylistListFeed.php
+++ b/library/Zend/GData/YouTube/PlaylistListFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlaylistListFeed extends \Zend\GData\Media\Feed
 {
diff --git a/library/Zend/GData/YouTube/PlaylistVideoEntry.php b/library/Zend/GData/YouTube/PlaylistVideoEntry.php
index 5d3c0933bb8..d52478e3934 100644
--- a/library/Zend/GData/YouTube/PlaylistVideoEntry.php
+++ b/library/Zend/GData/YouTube/PlaylistVideoEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlaylistVideoEntry extends VideoEntry
 {
diff --git a/library/Zend/GData/YouTube/PlaylistVideoFeed.php b/library/Zend/GData/YouTube/PlaylistVideoFeed.php
index de6d9458f1e..8d74506e166 100644
--- a/library/Zend/GData/YouTube/PlaylistVideoFeed.php
+++ b/library/Zend/GData/YouTube/PlaylistVideoFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlaylistVideoFeed extends \Zend\GData\Media\Feed
 {
diff --git a/library/Zend/GData/YouTube/SubscriptionEntry.php b/library/Zend/GData/YouTube/SubscriptionEntry.php
index 0d6e9bf3592..4ff043b8297 100644
--- a/library/Zend/GData/YouTube/SubscriptionEntry.php
+++ b/library/Zend/GData/YouTube/SubscriptionEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SubscriptionEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/YouTube/SubscriptionFeed.php b/library/Zend/GData/YouTube/SubscriptionFeed.php
index fa585b2f46f..65008d74a08 100644
--- a/library/Zend/GData/YouTube/SubscriptionFeed.php
+++ b/library/Zend/GData/YouTube/SubscriptionFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SubscriptionFeed extends \Zend\GData\Media\Feed
 {
diff --git a/library/Zend/GData/YouTube/UserProfileEntry.php b/library/Zend/GData/YouTube/UserProfileEntry.php
index 7d5cda54425..1a30e207a59 100644
--- a/library/Zend/GData/YouTube/UserProfileEntry.php
+++ b/library/Zend/GData/YouTube/UserProfileEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserProfileEntry extends \Zend\GData\Entry
 {
diff --git a/library/Zend/GData/YouTube/VideoEntry.php b/library/Zend/GData/YouTube/VideoEntry.php
index 657ad8d778a..f174f2269c5 100644
--- a/library/Zend/GData/YouTube/VideoEntry.php
+++ b/library/Zend/GData/YouTube/VideoEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VideoEntry extends MediaEntry
 {
diff --git a/library/Zend/GData/YouTube/VideoFeed.php b/library/Zend/GData/YouTube/VideoFeed.php
index a3a1193f796..9bbaf52633b 100644
--- a/library/Zend/GData/YouTube/VideoFeed.php
+++ b/library/Zend/GData/YouTube/VideoFeed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VideoFeed extends \Zend\GData\Media\Feed
 {
diff --git a/library/Zend/GData/YouTube/VideoQuery.php b/library/Zend/GData/YouTube/VideoQuery.php
index 9915a9a18aa..7ec987f8ed3 100644
--- a/library/Zend/GData/YouTube/VideoQuery.php
+++ b/library/Zend/GData/YouTube/VideoQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\GData\YouTube;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class VideoQuery extends \Zend\GData\Query
 {
diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php
old mode 100755
new mode 100644
index 3aae0fdb9c7..f3de88076dd
--- a/library/Zend/Http/Client.php
+++ b/library/Zend/Http/Client.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend\Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Client implements Stdlib\DispatchableInterface
 {
diff --git a/library/Zend/Http/Client/Adapter/AdapterInterface.php b/library/Zend/Http/Client/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index bf7facd8445..ece05111772
--- a/library/Zend/Http/Client/Adapter/AdapterInterface.php
+++ b/library/Zend/Http/Client/Adapter/AdapterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/Http/Client/Adapter/Curl.php b/library/Zend/Http/Client/Adapter/Curl.php
old mode 100755
new mode 100644
index ae8229bbf6b..5de8ca2f2ba
--- a/library/Zend/Http/Client/Adapter/Curl.php
+++ b/library/Zend/Http/Client/Adapter/Curl.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -36,8 +34,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Curl implements HttpAdapter, StreamInterface
 {
diff --git a/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php b/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 1f78cbe9e6b..e2f0f2fe823
--- a/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
     extends HttpClientException
diff --git a/library/Zend/Http/Client/Adapter/Exception/InitializationException.php b/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
old mode 100755
new mode 100644
index 736175eed8d..ccc663f2a86
--- a/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InitializationException extends RuntimeException
 {}
diff --git a/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index cefc8b7e914..bf23c6af2a0
--- a/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
diff --git a/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php b/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index b751a3286a2..1121b9251fd
--- a/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException
     extends Exception\OutOfRangeException
diff --git a/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php b/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index e48b984a2c4..261814c7432
--- a/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends Exception\RuntimeException
diff --git a/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php b/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
old mode 100755
new mode 100644
index d461e65a752..be04804b90d
--- a/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TimeoutException
     extends RuntimeException
diff --git a/library/Zend/Http/Client/Adapter/Proxy.php b/library/Zend/Http/Client/Adapter/Proxy.php
old mode 100755
new mode 100644
index 160d8421afa..d441c965866
--- a/library/Zend/Http/Client/Adapter/Proxy.php
+++ b/library/Zend/Http/Client/Adapter/Proxy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Proxy extends Socket
 {
diff --git a/library/Zend/Http/Client/Adapter/Socket.php b/library/Zend/Http/Client/Adapter/Socket.php
old mode 100755
new mode 100644
index 7ac9cc69c87..bfbdf434e98
--- a/library/Zend/Http/Client/Adapter/Socket.php
+++ b/library/Zend/Http/Client/Adapter/Socket.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Socket implements HttpAdapter, StreamInterface
 {
diff --git a/library/Zend/Http/Client/Adapter/StreamInterface.php b/library/Zend/Http/Client/Adapter/StreamInterface.php
old mode 100755
new mode 100644
index f9f00ffbd13..a9d20b95f84
--- a/library/Zend/Http/Client/Adapter/StreamInterface.php
+++ b/library/Zend/Http/Client/Adapter/StreamInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StreamInterface
 {
diff --git a/library/Zend/Http/Client/Adapter/Test.php b/library/Zend/Http/Client/Adapter/Test.php
old mode 100755
new mode 100644
index b8392330caa..5cdacbf7ccb
--- a/library/Zend/Http/Client/Adapter/Test.php
+++ b/library/Zend/Http/Client/Adapter/Test.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -36,8 +34,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Test implements AdapterInterface
 {
diff --git a/library/Zend/Http/Client/Cookies.php b/library/Zend/Http/Client/Cookies.php
index 38d69fc72ca..da88835fa30 100644
--- a/library/Zend/Http/Client/Cookies.php
+++ b/library/Zend/Http/Client/Cookies.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client;
@@ -46,8 +44,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cookies
 {
diff --git a/library/Zend/Http/Client/Exception/ExceptionInterface.php b/library/Zend/Http/Client/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 3134e6fe1ba..81ebe3e1074
--- a/library/Zend/Http/Client/Exception/ExceptionInterface.php
+++ b/library/Zend/Http/Client/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Client\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends HttpException
 {}
diff --git a/library/Zend/Http/Client/Exception/InvalidArgumentException.php b/library/Zend/Http/Client/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 68e403ed382..9dcc9a4b49c
--- a/library/Zend/Http/Client/Exception/InvalidArgumentException.php
+++ b/library/Zend/Http/Client/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
diff --git a/library/Zend/Http/Client/Exception/OutOfRangeException.php b/library/Zend/Http/Client/Exception/OutOfRangeException.php
index 3196820a404..cbfb745fae3 100644
--- a/library/Zend/Http/Client/Exception/OutOfRangeException.php
+++ b/library/Zend/Http/Client/Exception/OutOfRangeException.php
@@ -7,4 +7,4 @@
 class OutOfRangeException
     extends Exception\OutOfRangeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Http/Client/Exception/RuntimeException.php b/library/Zend/Http/Client/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 8359ab037b1..4887c24b0dd
--- a/library/Zend/Http/Client/Exception/RuntimeException.php
+++ b/library/Zend/Http/Client/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends Exception\RuntimeException
diff --git a/library/Zend/Http/ClientStatic.php b/library/Zend/Http/ClientStatic.php
index 6be4be3205b..ea4fbdaec66 100644
--- a/library/Zend/Http/ClientStatic.php
+++ b/library/Zend/Http/ClientStatic.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend\Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClientStatic
 {
diff --git a/library/Zend/Http/Cookies.php b/library/Zend/Http/Cookies.php
index e7425696bae..d0c950ff8f3 100644
--- a/library/Zend/Http/Cookies.php
+++ b/library/Zend/Http/Cookies.php
@@ -26,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cookies extends Headers
 {
diff --git a/library/Zend/Http/Exception/ExceptionInterface.php b/library/Zend/Http/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Exception/InvalidArgumentException.php b/library/Zend/Http/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Exception/OutOfRangeException.php b/library/Zend/Http/Exception/OutOfRangeException.php
index f7cc635557e..de7ac00f6a0 100644
--- a/library/Zend/Http/Exception/OutOfRangeException.php
+++ b/library/Zend/Http/Exception/OutOfRangeException.php
@@ -5,4 +5,4 @@
 class OutOfRangeException
     extends \OutOfRangeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Http/Exception/RuntimeException.php b/library/Zend/Http/Exception/RuntimeException.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/AbstractAccept.php b/library/Zend/Http/Header/AbstractAccept.php
index 641794d076b..77c8507b794 100644
--- a/library/Zend/Http/Header/AbstractAccept.php
+++ b/library/Zend/Http/Header/AbstractAccept.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 namespace Zend\Http\Header;
 
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 abstract class AbstractAccept implements HeaderInterface
diff --git a/library/Zend/Http/Header/AbstractDate.php b/library/Zend/Http/Header/AbstractDate.php
index 96412e368d3..59b85937bd4 100644
--- a/library/Zend/Http/Header/AbstractDate.php
+++ b/library/Zend/Http/Header/AbstractDate.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractDate implements HeaderInterface
 {
diff --git a/library/Zend/Http/Header/AbstractLocation.php b/library/Zend/Http/Header/AbstractLocation.php
index 2325a9062f3..014dd83179e 100644
--- a/library/Zend/Http/Header/AbstractLocation.php
+++ b/library/Zend/Http/Header/AbstractLocation.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractLocation implements HeaderInterface
 {
diff --git a/library/Zend/Http/Header/Accept.php b/library/Zend/Http/Header/Accept.php
old mode 100755
new mode 100644
index 04530be5724..30a11a9bf40
--- a/library/Zend/Http/Header/Accept.php
+++ b/library/Zend/Http/Header/Accept.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 namespace Zend\Http\Header;
 
@@ -24,8 +22,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 class Accept extends AbstractAccept
diff --git a/library/Zend/Http/Header/AcceptCharset.php b/library/Zend/Http/Header/AcceptCharset.php
old mode 100755
new mode 100644
index 3363f0097fc..92277cc1aa8
--- a/library/Zend/Http/Header/AcceptCharset.php
+++ b/library/Zend/Http/Header/AcceptCharset.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 namespace Zend\Http\Header;
 
@@ -24,8 +22,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.2
  */
 class AcceptCharset extends AbstractAccept
diff --git a/library/Zend/Http/Header/AcceptEncoding.php b/library/Zend/Http/Header/AcceptEncoding.php
old mode 100755
new mode 100644
index de6fb4fbb63..2f0819aed4c
--- a/library/Zend/Http/Header/AcceptEncoding.php
+++ b/library/Zend/Http/Header/AcceptEncoding.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 namespace Zend\Http\Header;
 
@@ -24,8 +22,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
  */
 class AcceptEncoding extends AbstractAccept
diff --git a/library/Zend/Http/Header/AcceptLanguage.php b/library/Zend/Http/Header/AcceptLanguage.php
old mode 100755
new mode 100644
index 29da8fa5c75..1fab9260a53
--- a/library/Zend/Http/Header/AcceptLanguage.php
+++ b/library/Zend/Http/Header/AcceptLanguage.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 namespace Zend\Http\Header;
 
@@ -24,8 +22,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
  */
 class AcceptLanguage extends AbstractAccept
diff --git a/library/Zend/Http/Header/AcceptRanges.php b/library/Zend/Http/Header/AcceptRanges.php
old mode 100755
new mode 100644
index d96ef50c23d..c2be349fe79
--- a/library/Zend/Http/Header/AcceptRanges.php
+++ b/library/Zend/Http/Header/AcceptRanges.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 namespace Zend\Http\Header;
 
@@ -24,8 +22,6 @@
  *
  * @category   Zend
  * @package    Zend\Http\Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.5
  */
 class AcceptRanges implements HeaderInterface
diff --git a/library/Zend/Http/Header/Age.php b/library/Zend/Http/Header/Age.php
old mode 100755
new mode 100644
index f1cc3b26a1f..207003718cd
--- a/library/Zend/Http/Header/Age.php
+++ b/library/Zend/Http/Header/Age.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/Allow.php b/library/Zend/Http/Header/Allow.php
old mode 100755
new mode 100644
index 142339f6eb4..da02edc4223
--- a/library/Zend/Http/Header/Allow.php
+++ b/library/Zend/Http/Header/Allow.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/AuthenticationInfo.php b/library/Zend/Http/Header/AuthenticationInfo.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Authorization.php b/library/Zend/Http/Header/Authorization.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/CacheControl.php b/library/Zend/Http/Header/CacheControl.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Connection.php b/library/Zend/Http/Header/Connection.php
old mode 100755
new mode 100644
index d326d2cc66f..5ed49576ff5
--- a/library/Zend/Http/Header/Connection.php
+++ b/library/Zend/Http/Header/Connection.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 namespace Zend\Http\Header;
diff --git a/library/Zend/Http/Header/ContentDisposition.php b/library/Zend/Http/Header/ContentDisposition.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ContentEncoding.php b/library/Zend/Http/Header/ContentEncoding.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ContentLanguage.php b/library/Zend/Http/Header/ContentLanguage.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ContentLength.php b/library/Zend/Http/Header/ContentLength.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ContentLocation.php b/library/Zend/Http/Header/ContentLocation.php
old mode 100755
new mode 100644
index 02688589de3..3bc08c042d7
--- a/library/Zend/Http/Header/ContentLocation.php
+++ b/library/Zend/Http/Header/ContentLocation.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/ContentMD5.php b/library/Zend/Http/Header/ContentMD5.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ContentRange.php b/library/Zend/Http/Header/ContentRange.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ContentType.php b/library/Zend/Http/Header/ContentType.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Cookie.php b/library/Zend/Http/Header/Cookie.php
old mode 100755
new mode 100644
index 3d0008e6c51..fbe18d5aeb1
--- a/library/Zend/Http/Header/Cookie.php
+++ b/library/Zend/Http/Header/Cookie.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Cookie
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Header;
diff --git a/library/Zend/Http/Header/Date.php b/library/Zend/Http/Header/Date.php
old mode 100755
new mode 100644
index 0d091fc190f..2069e51ddd4
--- a/library/Zend/Http/Header/Date.php
+++ b/library/Zend/Http/Header/Date.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/Etag.php b/library/Zend/Http/Header/Etag.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Expect.php b/library/Zend/Http/Header/Expect.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Expires.php b/library/Zend/Http/Header/Expires.php
old mode 100755
new mode 100644
index 80e7016dfa5..d60e2f19f1a
--- a/library/Zend/Http/Header/Expires.php
+++ b/library/Zend/Http/Header/Expires.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/From.php b/library/Zend/Http/Header/From.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/GenericHeader.php b/library/Zend/Http/Header/GenericHeader.php
index 33a12082d50..4512f53b171 100644
--- a/library/Zend/Http/Header/GenericHeader.php
+++ b/library/Zend/Http/Header/GenericHeader.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/HeaderInterface.php b/library/Zend/Http/Header/HeaderInterface.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Host.php b/library/Zend/Http/Header/Host.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/IfMatch.php b/library/Zend/Http/Header/IfMatch.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/IfModifiedSince.php b/library/Zend/Http/Header/IfModifiedSince.php
old mode 100755
new mode 100644
index 9eabf0e0a89..5f59bf0b451
--- a/library/Zend/Http/Header/IfModifiedSince.php
+++ b/library/Zend/Http/Header/IfModifiedSince.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/IfNoneMatch.php b/library/Zend/Http/Header/IfNoneMatch.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/IfRange.php b/library/Zend/Http/Header/IfRange.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/IfUnmodifiedSince.php b/library/Zend/Http/Header/IfUnmodifiedSince.php
old mode 100755
new mode 100644
index 2828c201ffe..653978ac3b4
--- a/library/Zend/Http/Header/IfUnmodifiedSince.php
+++ b/library/Zend/Http/Header/IfUnmodifiedSince.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/KeepAlive.php b/library/Zend/Http/Header/KeepAlive.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/LastModified.php b/library/Zend/Http/Header/LastModified.php
old mode 100755
new mode 100644
index 0dad953d087..7c746fb410d
--- a/library/Zend/Http/Header/LastModified.php
+++ b/library/Zend/Http/Header/LastModified.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/Location.php b/library/Zend/Http/Header/Location.php
old mode 100755
new mode 100644
index 03aed0b3a13..75c1a2d9186
--- a/library/Zend/Http/Header/Location.php
+++ b/library/Zend/Http/Header/Location.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/MaxForwards.php b/library/Zend/Http/Header/MaxForwards.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/MultipleHeaderInterface.php b/library/Zend/Http/Header/MultipleHeaderInterface.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Pragma.php b/library/Zend/Http/Header/Pragma.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ProxyAuthenticate.php b/library/Zend/Http/Header/ProxyAuthenticate.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/ProxyAuthorization.php b/library/Zend/Http/Header/ProxyAuthorization.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Range.php b/library/Zend/Http/Header/Range.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Referer.php b/library/Zend/Http/Header/Referer.php
old mode 100755
new mode 100644
index 07baec4d131..e7e04ca2bcf
--- a/library/Zend/Http/Header/Referer.php
+++ b/library/Zend/Http/Header/Referer.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/Refresh.php b/library/Zend/Http/Header/Refresh.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/RetryAfter.php b/library/Zend/Http/Header/RetryAfter.php
old mode 100755
new mode 100644
index 261d587b744..e472676de32
--- a/library/Zend/Http/Header/RetryAfter.php
+++ b/library/Zend/Http/Header/RetryAfter.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/Header/Server.php b/library/Zend/Http/Header/Server.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/SetCookie.php b/library/Zend/Http/Header/SetCookie.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/TE.php b/library/Zend/Http/Header/TE.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Trailer.php b/library/Zend/Http/Header/Trailer.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/TransferEncoding.php b/library/Zend/Http/Header/TransferEncoding.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Upgrade.php b/library/Zend/Http/Header/Upgrade.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/UserAgent.php b/library/Zend/Http/Header/UserAgent.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Vary.php b/library/Zend/Http/Header/Vary.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Via.php b/library/Zend/Http/Header/Via.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/WWWAuthenticate.php b/library/Zend/Http/Header/WWWAuthenticate.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Header/Warning.php b/library/Zend/Http/Header/Warning.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/HeaderLoader.php b/library/Zend/Http/HeaderLoader.php
index bfc7604fdc1..935086be1b4 100644
--- a/library/Zend/Http/HeaderLoader.php
+++ b/library/Zend/Http/HeaderLoader.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
@@ -17,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HeaderLoader extends PluginClassLoader
 {
diff --git a/library/Zend/Http/Headers.php b/library/Zend/Http/Headers.php
index 8ce8e3c7098..d15663d7f4e 100644
--- a/library/Zend/Http/Headers.php
+++ b/library/Zend/Http/Headers.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
diff --git a/library/Zend/Http/PhpEnvironment/Request.php b/library/Zend/Http/PhpEnvironment/Request.php
old mode 100755
new mode 100644
index 01ae814d19c..de20316b818
--- a/library/Zend/Http/PhpEnvironment/Request.php
+++ b/library/Zend/Http/PhpEnvironment/Request.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Http
  */
 
@@ -21,8 +19,6 @@
  *
  * @category   Zend
  * @package    Zend_Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Request extends HttpRequest
 {
diff --git a/library/Zend/Http/PhpEnvironment/Response.php b/library/Zend/Http/PhpEnvironment/Response.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Response/Stream.php b/library/Zend/Http/Response/Stream.php
old mode 100755
new mode 100644
index f3c5234de45..4dcf5774cf4
--- a/library/Zend/Http/Response/Stream.php
+++ b/library/Zend/Http/Response/Stream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Http\Response;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_Http
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Stream extends Response
 {
diff --git a/library/Zend/I18n/Exception/ExceptionInterface.php b/library/Zend/I18n/Exception/ExceptionInterface.php
index 1c91479af16..67d55436d58 100644
--- a/library/Zend/I18n/Exception/ExceptionInterface.php
+++ b/library/Zend/I18n/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Exception/InvalidArgumentException.php b/library/Zend/I18n/Exception/InvalidArgumentException.php
index f497a7565cd..fa25d08772f 100644
--- a/library/Zend/I18n/Exception/InvalidArgumentException.php
+++ b/library/Zend/I18n/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Exception;
@@ -25,9 +23,7 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/I18n/Exception/OutOfBoundsException.php b/library/Zend/I18n/Exception/OutOfBoundsException.php
index ee50c2d1967..bf05353292b 100644
--- a/library/Zend/I18n/Exception/OutOfBoundsException.php
+++ b/library/Zend/I18n/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements
     ExceptionInterface
diff --git a/library/Zend/I18n/Exception/ParseException.php b/library/Zend/I18n/Exception/ParseException.php
index e9433e1ae41..fb716a983d0 100644
--- a/library/Zend/I18n/Exception/ParseException.php
+++ b/library/Zend/I18n/Exception/ParseException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParseException extends RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Exception/RangeException.php b/library/Zend/I18n/Exception/RangeException.php
index 48b5a22c73e..f6f3eb8e772 100644
--- a/library/Zend/I18n/Exception/RangeException.php
+++ b/library/Zend/I18n/Exception/RangeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RangeException extends \RangeException implements ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Exception/RuntimeException.php b/library/Zend/I18n/Exception/RuntimeException.php
index 3b61d1146c9..c396fa95271 100644
--- a/library/Zend/I18n/Exception/RuntimeException.php
+++ b/library/Zend/I18n/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Filter/AbstractLocale.php b/library/Zend/I18n/Filter/AbstractLocale.php
index aaa9ae448b2..e11950d7b51 100644
--- a/library/Zend/I18n/Filter/AbstractLocale.php
+++ b/library/Zend/I18n/Filter/AbstractLocale.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Filter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractLocale extends AbstractFilter
 {
diff --git a/library/Zend/I18n/Filter/Alnum.php b/library/Zend/I18n/Filter/Alnum.php
index a18e4e660f5..ae33689b0f4 100644
--- a/library/Zend/I18n/Filter/Alnum.php
+++ b/library/Zend/I18n/Filter/Alnum.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Filter;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Alnum extends AbstractLocale
 {
diff --git a/library/Zend/I18n/Filter/Alpha.php b/library/Zend/I18n/Filter/Alpha.php
index 3888e6871ec..ad963e3cd1b 100644
--- a/library/Zend/I18n/Filter/Alpha.php
+++ b/library/Zend/I18n/Filter/Alpha.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Filter;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Alpha extends Alnum
 {
diff --git a/library/Zend/I18n/Filter/NumberFormat.php b/library/Zend/I18n/Filter/NumberFormat.php
index fc25ff38d6f..4529792f4b5 100644
--- a/library/Zend/I18n/Filter/NumberFormat.php
+++ b/library/Zend/I18n/Filter/NumberFormat.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Filter;
diff --git a/library/Zend/I18n/Translator/Loader/Gettext.php b/library/Zend/I18n/Translator/Loader/Gettext.php
index 2b47e414b5f..6f36158fb4d 100644
--- a/library/Zend/I18n/Translator/Loader/Gettext.php
+++ b/library/Zend/I18n/Translator/Loader/Gettext.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator\Loader;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Gettext implements LoaderInterface
 {
diff --git a/library/Zend/I18n/Translator/Loader/LoaderInterface.php b/library/Zend/I18n/Translator/Loader/LoaderInterface.php
index 322afcc1962..3bb1ec4eaae 100644
--- a/library/Zend/I18n/Translator/Loader/LoaderInterface.php
+++ b/library/Zend/I18n/Translator/Loader/LoaderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator\Loader;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface LoaderInterface
 {
diff --git a/library/Zend/I18n/Translator/Loader/PhpArray.php b/library/Zend/I18n/Translator/Loader/PhpArray.php
index 1a78c4de89b..177f9b62534 100644
--- a/library/Zend/I18n/Translator/Loader/PhpArray.php
+++ b/library/Zend/I18n/Translator/Loader/PhpArray.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator\Loader;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhpArray implements LoaderInterface
 {
diff --git a/library/Zend/I18n/Translator/LoaderPluginManager.php b/library/Zend/I18n/Translator/LoaderPluginManager.php
index 2b0e5ad5403..722bed16e90 100644
--- a/library/Zend/I18n/Translator/LoaderPluginManager.php
+++ b/library/Zend/I18n/Translator/LoaderPluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LoaderPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/I18n/Translator/Plural/Parser.php b/library/Zend/I18n/Translator/Plural/Parser.php
index b08bd714ac1..b165fb8a9ba 100644
--- a/library/Zend/I18n/Translator/Plural/Parser.php
+++ b/library/Zend/I18n/Translator/Plural/Parser.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator\Plural;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Parser
 {
diff --git a/library/Zend/I18n/Translator/Plural/Rule.php b/library/Zend/I18n/Translator/Plural/Rule.php
index 2ee763c3721..fc6fdabee0d 100644
--- a/library/Zend/I18n/Translator/Plural/Rule.php
+++ b/library/Zend/I18n/Translator/Plural/Rule.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator\Plural;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rule
 {
diff --git a/library/Zend/I18n/Translator/Plural/Symbol.php b/library/Zend/I18n/Translator/Plural/Symbol.php
index 374ad12a00f..20820f11842 100644
--- a/library/Zend/I18n/Translator/Plural/Symbol.php
+++ b/library/Zend/I18n/Translator/Plural/Symbol.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator\Plural;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Symbol
 {
diff --git a/library/Zend/I18n/Translator/TextDomain.php b/library/Zend/I18n/Translator/TextDomain.php
index 92568483fff..d67f1d7065b 100644
--- a/library/Zend/I18n/Translator/TextDomain.php
+++ b/library/Zend/I18n/Translator/TextDomain.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TextDomain extends ArrayObject
 {
diff --git a/library/Zend/I18n/Translator/Translator.php b/library/Zend/I18n/Translator/Translator.php
index 5e1452e4d3e..d05fdf49187 100644
--- a/library/Zend/I18n/Translator/Translator.php
+++ b/library/Zend/I18n/Translator/Translator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Translator
 {
diff --git a/library/Zend/I18n/Translator/TranslatorServiceFactory.php b/library/Zend/I18n/Translator/TranslatorServiceFactory.php
index b92ce0caf83..672d5acff08 100644
--- a/library/Zend/I18n/Translator/TranslatorServiceFactory.php
+++ b/library/Zend/I18n/Translator/TranslatorServiceFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Translator;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage Translator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TranslatorServiceFactory implements FactoryInterface
 {
diff --git a/library/Zend/I18n/Validator/Alnum.php b/library/Zend/I18n/Validator/Alnum.php
index 83407667559..279533799d1 100644
--- a/library/Zend/I18n/Validator/Alnum.php
+++ b/library/Zend/I18n/Validator/Alnum.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Alnum extends AbstractValidator
 {
diff --git a/library/Zend/I18n/Validator/Alpha.php b/library/Zend/I18n/Validator/Alpha.php
index de81245581a..800ed172e52 100644
--- a/library/Zend/I18n/Validator/Alpha.php
+++ b/library/Zend/I18n/Validator/Alpha.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Alpha extends Alnum
 {
diff --git a/library/Zend/I18n/Validator/Float.php b/library/Zend/I18n/Validator/Float.php
index c2f46bc8d06..3d5e35a3c62 100644
--- a/library/Zend/I18n/Validator/Float.php
+++ b/library/Zend/I18n/Validator/Float.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Validator;
@@ -30,8 +28,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Float extends AbstractValidator
 {
diff --git a/library/Zend/I18n/Validator/Iban.php b/library/Zend/I18n/Validator/Iban.php
index ee18f9d9fc5..039001a04ab 100644
--- a/library/Zend/I18n/Validator/Iban.php
+++ b/library/Zend/I18n/Validator/Iban.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Validator;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Iban extends AbstractValidator
 {
diff --git a/library/Zend/I18n/Validator/Int.php b/library/Zend/I18n/Validator/Int.php
index 401375d3809..d20e0f0984d 100644
--- a/library/Zend/I18n/Validator/Int.php
+++ b/library/Zend/I18n/Validator/Int.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Validator;
@@ -30,8 +28,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Int extends AbstractValidator
 {
diff --git a/library/Zend/I18n/Validator/PostCode.php b/library/Zend/I18n/Validator/PostCode.php
index 3f0999d3c4d..884a360633c 100644
--- a/library/Zend/I18n/Validator/PostCode.php
+++ b/library/Zend/I18n/Validator/PostCode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\Validator;
@@ -30,8 +28,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PostCode extends AbstractValidator
 {
diff --git a/library/Zend/I18n/View/Helper/CurrencyFormat.php b/library/Zend/I18n/View/Helper/CurrencyFormat.php
index 597816fa261..e01a94daa49 100644
--- a/library/Zend/I18n/View/Helper/CurrencyFormat.php
+++ b/library/Zend/I18n/View/Helper/CurrencyFormat.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\View\Helper;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CurrencyFormat extends AbstractHelper
 {
diff --git a/library/Zend/I18n/View/Helper/DateFormat.php b/library/Zend/I18n/View/Helper/DateFormat.php
index a619f06e2e8..46e69388f05 100644
--- a/library/Zend/I18n/View/Helper/DateFormat.php
+++ b/library/Zend/I18n/View/Helper/DateFormat.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\View\Helper;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DateFormat extends AbstractHelper
 {
diff --git a/library/Zend/I18n/View/Helper/NumberFormat.php b/library/Zend/I18n/View/Helper/NumberFormat.php
index 05814cb7436..56384a96f94 100644
--- a/library/Zend/I18n/View/Helper/NumberFormat.php
+++ b/library/Zend/I18n/View/Helper/NumberFormat.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\View\Helper;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumberFormat extends AbstractHelper
 {
diff --git a/library/Zend/I18n/View/Helper/Translate.php b/library/Zend/I18n/View/Helper/Translate.php
index 59da76c6af5..2f0d15e051e 100644
--- a/library/Zend/I18n/View/Helper/Translate.php
+++ b/library/Zend/I18n/View/Helper/Translate.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\View\Helper;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Translate extends AbstractHelper
 {
diff --git a/library/Zend/I18n/View/Helper/TranslatePlural.php b/library/Zend/I18n/View/Helper/TranslatePlural.php
index 188f1089ca4..dc8bea12cc4 100644
--- a/library/Zend/I18n/View/Helper/TranslatePlural.php
+++ b/library/Zend/I18n/View/Helper/TranslatePlural.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\View\Helper;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TranslatePlural extends AbstractHelper
 {
diff --git a/library/Zend/I18n/View/HelperConfiguration.php b/library/Zend/I18n/View/HelperConfiguration.php
index 0de3d4a8023..7fb46cffead 100644
--- a/library/Zend/I18n/View/HelperConfiguration.php
+++ b/library/Zend/I18n/View/HelperConfiguration.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\I18n\View;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_I18n
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelperConfiguration implements ConfigurationInterface
 {
diff --git a/library/Zend/InfoCard/Adapter/AdapterInterface.php b/library/Zend/InfoCard/Adapter/AdapterInterface.php
index 8534a249274..455e5986196 100644
--- a/library/Zend/InfoCard/Adapter/AdapterInterface.php
+++ b/library/Zend/InfoCard/Adapter/AdapterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Adapter;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/InfoCard/Adapter/DefaultAdapter.php b/library/Zend/InfoCard/Adapter/DefaultAdapter.php
index e7b888dd16e..eb480f4ded3 100644
--- a/library/Zend/InfoCard/Adapter/DefaultAdapter.php
+++ b/library/Zend/InfoCard/Adapter/DefaultAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultAdapter implements AdapterInterface
 {
diff --git a/library/Zend/InfoCard/Cipher.php b/library/Zend/InfoCard/Cipher.php
index cf87099f615..d378504194c 100644
--- a/library/Zend/InfoCard/Cipher.php
+++ b/library/Zend/InfoCard/Cipher.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cipher
 {
diff --git a/library/Zend/InfoCard/Cipher/Exception/ExceptionInterface.php b/library/Zend/InfoCard/Cipher/Exception/ExceptionInterface.php
index fc5702c2517..3aa30dfb55c 100644
--- a/library/Zend/InfoCard/Cipher/Exception/ExceptionInterface.php
+++ b/library/Zend/InfoCard/Cipher/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/InfoCard/Cipher/Exception/InvalidArgumentException.php b/library/Zend/InfoCard/Cipher/Exception/InvalidArgumentException.php
index 514e915d14a..290d44d850c 100644
--- a/library/Zend/InfoCard/Cipher/Exception/InvalidArgumentException.php
+++ b/library/Zend/InfoCard/Cipher/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/Cipher/Exception/RuntimeException.php b/library/Zend/InfoCard/Cipher/Exception/RuntimeException.php
index 74fedc368f3..c6bb4826abb 100644
--- a/library/Zend/InfoCard/Cipher/Exception/RuntimeException.php
+++ b/library/Zend/InfoCard/Cipher/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/Cipher/PKI/Adapter/AbstractAdapter.php b/library/Zend/InfoCard/Cipher/PKI/Adapter/AbstractAdapter.php
index ca83cdb93a3..8afee08ba9a 100644
--- a/library/Zend/InfoCard/Cipher/PKI/Adapter/AbstractAdapter.php
+++ b/library/Zend/InfoCard/Cipher/PKI/Adapter/AbstractAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\PKI\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements Cipher\PKI\PKIInterface
 {
diff --git a/library/Zend/InfoCard/Cipher/PKI/Adapter/RSA.php b/library/Zend/InfoCard/Cipher/PKI/Adapter/RSA.php
index d99e7fd02a2..62e4881bdc6 100644
--- a/library/Zend/InfoCard/Cipher/PKI/Adapter/RSA.php
+++ b/library/Zend/InfoCard/Cipher/PKI/Adapter/RSA.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\PKI\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RSA extends AbstractAdapter implements Cipher\PKI\RSAInterface
 {
diff --git a/library/Zend/InfoCard/Cipher/PKI/PKIInterface.php b/library/Zend/InfoCard/Cipher/PKI/PKIInterface.php
index 95f919e7af4..f369493b57a 100644
--- a/library/Zend/InfoCard/Cipher/PKI/PKIInterface.php
+++ b/library/Zend/InfoCard/Cipher/PKI/PKIInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\PKI;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface PKIInterface
 {
diff --git a/library/Zend/InfoCard/Cipher/PKI/RSAInterface.php b/library/Zend/InfoCard/Cipher/PKI/RSAInterface.php
index a0a22911c19..7d83bedaafc 100644
--- a/library/Zend/InfoCard/Cipher/PKI/RSAInterface.php
+++ b/library/Zend/InfoCard/Cipher/PKI/RSAInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\PKI;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RSAInterface
 {
diff --git a/library/Zend/InfoCard/Cipher/Symmetric/AES128CBCInterface.php b/library/Zend/InfoCard/Cipher/Symmetric/AES128CBCInterface.php
index d67efa38a29..9b0d9720cca 100644
--- a/library/Zend/InfoCard/Cipher/Symmetric/AES128CBCInterface.php
+++ b/library/Zend/InfoCard/Cipher/Symmetric/AES128CBCInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\Symmetric;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AES128CBCInterface extends AES256CBCInterface
 {
diff --git a/library/Zend/InfoCard/Cipher/Symmetric/AES256CBCInterface.php b/library/Zend/InfoCard/Cipher/Symmetric/AES256CBCInterface.php
index 6ae160bb92f..ed649dca29d 100644
--- a/library/Zend/InfoCard/Cipher/Symmetric/AES256CBCInterface.php
+++ b/library/Zend/InfoCard/Cipher/Symmetric/AES256CBCInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\Symmetric;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AES256CBCInterface
 {
diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES128CBC.php b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES128CBC.php
index 103a47ebefa..4af122cf9be 100644
--- a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES128CBC.php
+++ b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES128CBC.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\Symmetric\Adapter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AES128CBC extends AES256CBC
 {
diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES256CBC.php b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES256CBC.php
index 7bbbd19135b..9190e2a1119 100644
--- a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES256CBC.php
+++ b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AES256CBC.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\Symmetric\Adapter;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AES256CBC
     extends AbstractAdapter
diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AbstractAdapter.php b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AbstractAdapter.php
index eb06660ff12..3ad5399da35 100644
--- a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AbstractAdapter.php
+++ b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/AbstractAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\Symmetric\Adapter;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter
     implements \Zend\InfoCard\Cipher\Symmetric\SymmetricInterface
diff --git a/library/Zend/InfoCard/Cipher/Symmetric/SymmetricInterface.php b/library/Zend/InfoCard/Cipher/Symmetric/SymmetricInterface.php
index 2f581be2d01..a39e731691a 100644
--- a/library/Zend/InfoCard/Cipher/Symmetric/SymmetricInterface.php
+++ b/library/Zend/InfoCard/Cipher/Symmetric/SymmetricInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Cipher\Symmetric;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface SymmetricInterface
 {
diff --git a/library/Zend/InfoCard/Claims.php b/library/Zend/InfoCard/Claims.php
index da2fbdbe0f1..80a506cb71b 100644
--- a/library/Zend/InfoCard/Claims.php
+++ b/library/Zend/InfoCard/Claims.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Claims
 {
diff --git a/library/Zend/InfoCard/Exception/ExceptionInterface.php b/library/Zend/InfoCard/Exception/ExceptionInterface.php
index 183b71643da..a2a3f534419 100644
--- a/library/Zend/InfoCard/Exception/ExceptionInterface.php
+++ b/library/Zend/InfoCard/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\Exception;
diff --git a/library/Zend/InfoCard/Exception/InvalidArgumentException.php b/library/Zend/InfoCard/Exception/InvalidArgumentException.php
index 2a483f1dae4..ae33acc6408 100644
--- a/library/Zend/InfoCard/Exception/InvalidArgumentException.php
+++ b/library/Zend/InfoCard/Exception/InvalidArgumentException.php
@@ -5,4 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/Exception/RuntimeException.php b/library/Zend/InfoCard/Exception/RuntimeException.php
index e112f2be76b..c8cb472e503 100644
--- a/library/Zend/InfoCard/Exception/RuntimeException.php
+++ b/library/Zend/InfoCard/Exception/RuntimeException.php
@@ -5,4 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/InfoCard.php b/library/Zend/InfoCard/InfoCard.php
index d6183b74509..ae36ccbf5aa 100644
--- a/library/Zend/InfoCard/InfoCard.php
+++ b/library/Zend/InfoCard/InfoCard.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InfoCard
 {
diff --git a/library/Zend/InfoCard/XML/AbstractElement.php b/library/Zend/InfoCard/XML/AbstractElement.php
index c6ed5fa0d28..a5e225f7cba 100644
--- a/library/Zend/InfoCard/XML/AbstractElement.php
+++ b/library/Zend/InfoCard/XML/AbstractElement.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractElement extends SimpleXMLElement implements ElementInterface
 {
diff --git a/library/Zend/InfoCard/XML/Assertion/AssertionInterface.php b/library/Zend/InfoCard/XML/Assertion/AssertionInterface.php
index c1e4b00c551..af2067670dd 100644
--- a/library/Zend/InfoCard/XML/Assertion/AssertionInterface.php
+++ b/library/Zend/InfoCard/XML/Assertion/AssertionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Assertion;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AssertionInterface
 {
diff --git a/library/Zend/InfoCard/XML/Assertion/Factory.php b/library/Zend/InfoCard/XML/Assertion/Factory.php
index 36115b9ceaa..db775a3b6ac 100644
--- a/library/Zend/InfoCard/XML/Assertion/Factory.php
+++ b/library/Zend/InfoCard/XML/Assertion/Factory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Assertion;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class Factory
 {
diff --git a/library/Zend/InfoCard/XML/Assertion/SAML.php b/library/Zend/InfoCard/XML/Assertion/SAML.php
index 5ccb457ab76..0d518e63fac 100644
--- a/library/Zend/InfoCard/XML/Assertion/SAML.php
+++ b/library/Zend/InfoCard/XML/Assertion/SAML.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Assertion;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SAML extends AbstractElement implements AssertionInterface
 {
diff --git a/library/Zend/InfoCard/XML/ElementInterface.php b/library/Zend/InfoCard/XML/ElementInterface.php
index 71018386d2d..e71b8169a3b 100644
--- a/library/Zend/InfoCard/XML/ElementInterface.php
+++ b/library/Zend/InfoCard/XML/ElementInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ElementInterface
 {
diff --git a/library/Zend/InfoCard/XML/EncryptedData/AbstractEncryptedData.php b/library/Zend/InfoCard/XML/EncryptedData/AbstractEncryptedData.php
index de59635bd39..4d7b7319dcc 100644
--- a/library/Zend/InfoCard/XML/EncryptedData/AbstractEncryptedData.php
+++ b/library/Zend/InfoCard/XML/EncryptedData/AbstractEncryptedData.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\EncryptedData;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractEncryptedData extends AbstractElement
 {
diff --git a/library/Zend/InfoCard/XML/EncryptedData/Factory.php b/library/Zend/InfoCard/XML/EncryptedData/Factory.php
index b102fdf70f8..27cc05551d2 100644
--- a/library/Zend/InfoCard/XML/EncryptedData/Factory.php
+++ b/library/Zend/InfoCard/XML/EncryptedData/Factory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\EncryptedData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class Factory
 {
diff --git a/library/Zend/InfoCard/XML/EncryptedData/XMLEnc.php b/library/Zend/InfoCard/XML/EncryptedData/XMLEnc.php
index 6a41c0ef496..d3dbc079053 100644
--- a/library/Zend/InfoCard/XML/EncryptedData/XMLEnc.php
+++ b/library/Zend/InfoCard/XML/EncryptedData/XMLEnc.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\EncryptedData;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class XMLEnc extends AbstractEncryptedData
 {
diff --git a/library/Zend/InfoCard/XML/EncryptedKey.php b/library/Zend/InfoCard/XML/EncryptedKey.php
index 98ac7e970e7..34b3c85f57b 100644
--- a/library/Zend/InfoCard/XML/EncryptedKey.php
+++ b/library/Zend/InfoCard/XML/EncryptedKey.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EncryptedKey extends AbstractElement implements KeyInfo\KeyInfoInterface
 {
diff --git a/library/Zend/InfoCard/XML/Exception/ExceptionInterface.php b/library/Zend/InfoCard/XML/Exception/ExceptionInterface.php
index d83d2ef5a90..a4d5c187606 100644
--- a/library/Zend/InfoCard/XML/Exception/ExceptionInterface.php
+++ b/library/Zend/InfoCard/XML/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/InfoCard/XML/Exception/InvalidArgumentException.php b/library/Zend/InfoCard/XML/Exception/InvalidArgumentException.php
index 58729e56bdb..3ad11b60baf 100644
--- a/library/Zend/InfoCard/XML/Exception/InvalidArgumentException.php
+++ b/library/Zend/InfoCard/XML/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/XML/Exception/RuntimeException.php b/library/Zend/InfoCard/XML/Exception/RuntimeException.php
index 78e77087903..e3d23d1bde1 100644
--- a/library/Zend/InfoCard/XML/Exception/RuntimeException.php
+++ b/library/Zend/InfoCard/XML/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/XML/KeyInfo/AbstractKeyInfo.php b/library/Zend/InfoCard/XML/KeyInfo/AbstractKeyInfo.php
index 7ef1acfddc6..8f6c5dc7971 100644
--- a/library/Zend/InfoCard/XML/KeyInfo/AbstractKeyInfo.php
+++ b/library/Zend/InfoCard/XML/KeyInfo/AbstractKeyInfo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\KeyInfo;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractKeyInfo extends \Zend\InfoCard\XML\AbstractElement
 {
diff --git a/library/Zend/InfoCard/XML/KeyInfo/DefaultKeyInfo.php b/library/Zend/InfoCard/XML/KeyInfo/DefaultKeyInfo.php
index d63db9765b2..9b7da3ae656 100644
--- a/library/Zend/InfoCard/XML/KeyInfo/DefaultKeyInfo.php
+++ b/library/Zend/InfoCard/XML/KeyInfo/DefaultKeyInfo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\KeyInfo;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultKeyInfo extends AbstractKeyInfo
 {
diff --git a/library/Zend/InfoCard/XML/KeyInfo/Factory.php b/library/Zend/InfoCard/XML/KeyInfo/Factory.php
index d7a36c4ae84..59894db1292 100644
--- a/library/Zend/InfoCard/XML/KeyInfo/Factory.php
+++ b/library/Zend/InfoCard/XML/KeyInfo/Factory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\KeyInfo;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Factory
 {
diff --git a/library/Zend/InfoCard/XML/KeyInfo/KeyInfoInterface.php b/library/Zend/InfoCard/XML/KeyInfo/KeyInfoInterface.php
index 672329f9378..6fd4957aa8c 100644
--- a/library/Zend/InfoCard/XML/KeyInfo/KeyInfoInterface.php
+++ b/library/Zend/InfoCard/XML/KeyInfo/KeyInfoInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\KeyInfo;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface KeyInfoInterface
 {
diff --git a/library/Zend/InfoCard/XML/KeyInfo/XMLDSig.php b/library/Zend/InfoCard/XML/KeyInfo/XMLDSig.php
index 15d30f2e1f8..84ed616d28d 100644
--- a/library/Zend/InfoCard/XML/KeyInfo/XMLDSig.php
+++ b/library/Zend/InfoCard/XML/KeyInfo/XMLDSig.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\KeyInfo;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class XMLDSig extends AbstractKeyInfo implements KeyInfoInterface
 {
diff --git a/library/Zend/InfoCard/XML/Security.php b/library/Zend/InfoCard/XML/Security.php
index ab57cba6f9d..c88e9ca4a78 100644
--- a/library/Zend/InfoCard/XML/Security.php
+++ b/library/Zend/InfoCard/XML/Security.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Security
 {
diff --git a/library/Zend/InfoCard/XML/Security/Exception/ExceptionInterface.php b/library/Zend/InfoCard/XML/Security/Exception/ExceptionInterface.php
index ff3dfc95634..1844bcad9c4 100644
--- a/library/Zend/InfoCard/XML/Security/Exception/ExceptionInterface.php
+++ b/library/Zend/InfoCard/XML/Security/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Security\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/InfoCard/XML/Security/Exception/InvalidArgumentException.php b/library/Zend/InfoCard/XML/Security/Exception/InvalidArgumentException.php
index 779b6ed3d64..ec8295e2b11 100644
--- a/library/Zend/InfoCard/XML/Security/Exception/InvalidArgumentException.php
+++ b/library/Zend/InfoCard/XML/Security/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/XML/Security/Exception/RuntimeException.php b/library/Zend/InfoCard/XML/Security/Exception/RuntimeException.php
index cee534db2c4..536181a364e 100644
--- a/library/Zend/InfoCard/XML/Security/Exception/RuntimeException.php
+++ b/library/Zend/InfoCard/XML/Security/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InfoCard/XML/Security/Transform/EnvelopedSignature.php b/library/Zend/InfoCard/XML/Security/Transform/EnvelopedSignature.php
index 8a0fed4721e..086dcdeaf93 100644
--- a/library/Zend/InfoCard/XML/Security/Transform/EnvelopedSignature.php
+++ b/library/Zend/InfoCard/XML/Security/Transform/EnvelopedSignature.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Security\Transform;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EnvelopedSignature implements TransformInterface
 {
diff --git a/library/Zend/InfoCard/XML/Security/Transform/TransformChain.php b/library/Zend/InfoCard/XML/Security/Transform/TransformChain.php
index 5ccf9bc213b..3fcf68fe2b4 100644
--- a/library/Zend/InfoCard/XML/Security/Transform/TransformChain.php
+++ b/library/Zend/InfoCard/XML/Security/Transform/TransformChain.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Security\Transform;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TransformChain
 {
diff --git a/library/Zend/InfoCard/XML/Security/Transform/TransformInterface.php b/library/Zend/InfoCard/XML/Security/Transform/TransformInterface.php
index ccd46e7ad0e..74099958b15 100644
--- a/library/Zend/InfoCard/XML/Security/Transform/TransformInterface.php
+++ b/library/Zend/InfoCard/XML/Security/Transform/TransformInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Security\Transform;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TransformInterface
 {
diff --git a/library/Zend/InfoCard/XML/Security/Transform/XMLExcC14N.php b/library/Zend/InfoCard/XML/Security/Transform/XMLExcC14N.php
index 3cd89f0ee54..f643a8714c9 100644
--- a/library/Zend/InfoCard/XML/Security/Transform/XMLExcC14N.php
+++ b/library/Zend/InfoCard/XML/Security/Transform/XMLExcC14N.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML\Security\Transform;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class XMLExcC14N implements TransformInterface
 {
diff --git a/library/Zend/InfoCard/XML/SecurityTokenReference.php b/library/Zend/InfoCard/XML/SecurityTokenReference.php
index b7721072b1f..4298c5b08cd 100644
--- a/library/Zend/InfoCard/XML/SecurityTokenReference.php
+++ b/library/Zend/InfoCard/XML/SecurityTokenReference.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InfoCard\XML;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_InfoCard
  * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SecurityTokenReference extends AbstractElement
 {
diff --git a/library/Zend/InputFilter/BaseInputFilter.php b/library/Zend/InputFilter/BaseInputFilter.php
index d3845560574..facfa45c0af 100644
--- a/library/Zend/InputFilter/BaseInputFilter.php
+++ b/library/Zend/InputFilter/BaseInputFilter.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -29,8 +27,6 @@
  *             should a message be returned? if so, what message?
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BaseInputFilter implements InputFilterInterface
 {
diff --git a/library/Zend/InputFilter/Exception/ExceptionInterface.php b/library/Zend/InputFilter/Exception/ExceptionInterface.php
index e3904da64a1..43aabadf0dc 100644
--- a/library/Zend/InputFilter/Exception/ExceptionInterface.php
+++ b/library/Zend/InputFilter/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InputFilter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InputFilter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/InputFilter/Exception/InvalidArgumentException.php b/library/Zend/InputFilter/Exception/InvalidArgumentException.php
index 086a0267572..9067d758c92 100644
--- a/library/Zend/InputFilter/Exception/InvalidArgumentException.php
+++ b/library/Zend/InputFilter/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InputFilter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InputFilter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/InputFilter/Exception/RuntimeException.php b/library/Zend/InputFilter/Exception/RuntimeException.php
index b8dac285da2..55d2a3d3baa 100644
--- a/library/Zend/InputFilter/Exception/RuntimeException.php
+++ b/library/Zend/InputFilter/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_InputFilter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_InputFilter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/Factory.php
index 646b2b1dc4a..fc5ffba05c1 100644
--- a/library/Zend/InputFilter/Factory.php
+++ b/library/Zend/InputFilter/Factory.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Factory
 {
diff --git a/library/Zend/InputFilter/Input.php b/library/Zend/InputFilter/Input.php
index b889d991634..d52f85627af 100644
--- a/library/Zend/InputFilter/Input.php
+++ b/library/Zend/InputFilter/Input.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Input implements InputInterface
 {
diff --git a/library/Zend/InputFilter/InputFilter.php b/library/Zend/InputFilter/InputFilter.php
index ece340362f9..8272ee9a1de 100644
--- a/library/Zend/InputFilter/InputFilter.php
+++ b/library/Zend/InputFilter/InputFilter.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InputFilter extends BaseInputFilter
 {
diff --git a/library/Zend/InputFilter/InputFilterAwareInterface.php b/library/Zend/InputFilter/InputFilterAwareInterface.php
index ef2a5290d47..28174a06acc 100644
--- a/library/Zend/InputFilter/InputFilterAwareInterface.php
+++ b/library/Zend/InputFilter/InputFilterAwareInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InputFilterAwareInterface
 {
diff --git a/library/Zend/InputFilter/InputFilterInterface.php b/library/Zend/InputFilter/InputFilterInterface.php
index 65e0f774c00..c39807d07ca 100644
--- a/library/Zend/InputFilter/InputFilterInterface.php
+++ b/library/Zend/InputFilter/InputFilterInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InputFilterInterface extends Countable
 {
diff --git a/library/Zend/InputFilter/InputFilterProviderInterface.php b/library/Zend/InputFilter/InputFilterProviderInterface.php
index c8d179c049c..bcc8898e176 100644
--- a/library/Zend/InputFilter/InputFilterProviderInterface.php
+++ b/library/Zend/InputFilter/InputFilterProviderInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InputFilterProviderInterface
 {
diff --git a/library/Zend/InputFilter/InputInterface.php b/library/Zend/InputFilter/InputInterface.php
index 253ee190417..030ebf55db3 100644
--- a/library/Zend/InputFilter/InputInterface.php
+++ b/library/Zend/InputFilter/InputInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InputInterface
 {
diff --git a/library/Zend/InputFilter/InputProviderInterface.php b/library/Zend/InputFilter/InputProviderInterface.php
index 899beb31eeb..9809d7dcb9e 100644
--- a/library/Zend/InputFilter/InputProviderInterface.php
+++ b/library/Zend/InputFilter/InputProviderInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\InputFilter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_InputFilter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InputProviderInterface
 {
diff --git a/library/Zend/Json/Decoder.php b/library/Zend/Json/Decoder.php
index f162fcb6ee9..5b885f98fdd 100644
--- a/library/Zend/Json/Decoder.php
+++ b/library/Zend/Json/Decoder.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Decoder
 {
diff --git a/library/Zend/Json/Encoder.php b/library/Zend/Json/Encoder.php
index 13d0787ef76..3093ebe2b6d 100644
--- a/library/Zend/Json/Encoder.php
+++ b/library/Zend/Json/Encoder.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Encoder
 {
diff --git a/library/Zend/Json/Exception/BadMethodCallException.php b/library/Zend/Json/Exception/BadMethodCallException.php
index 0c4141a15e2..1f8980abb5c 100644
--- a/library/Zend/Json/Exception/BadMethodCallException.php
+++ b/library/Zend/Json/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Json/Exception/ExceptionInterface.php b/library/Zend/Json/Exception/ExceptionInterface.php
index 57ce647ca76..0142deb075a 100644
--- a/library/Zend/Json/Exception/ExceptionInterface.php
+++ b/library/Zend/Json/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Json/Exception/InvalidArgumentException.php b/library/Zend/Json/Exception/InvalidArgumentException.php
index 15a2e34a465..23e7326bc69 100644
--- a/library/Zend/Json/Exception/InvalidArgumentException.php
+++ b/library/Zend/Json/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Json/Exception/RecursionException.php b/library/Zend/Json/Exception/RecursionException.php
index 529e63289b3..173766bbddf 100644
--- a/library/Zend/Json/Exception/RecursionException.php
+++ b/library/Zend/Json/Exception/RecursionException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RecursionException extends RuntimeException
 {}
diff --git a/library/Zend/Json/Exception/RuntimeException.php b/library/Zend/Json/Exception/RuntimeException.php
index 2a52902c296..a1889f278f9 100644
--- a/library/Zend/Json/Exception/RuntimeException.php
+++ b/library/Zend/Json/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Json/Expr.php b/library/Zend/Json/Expr.php
index c12c4257558..6420ab84628 100644
--- a/library/Zend/Json/Expr.php
+++ b/library/Zend/Json/Expr.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Expr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json;
@@ -46,8 +44,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Expr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Expr
 {
diff --git a/library/Zend/Json/Json.php b/library/Zend/Json/Json.php
index bafbd3b0d19..08dd4f0b3c8 100644
--- a/library/Zend/Json/Json.php
+++ b/library/Zend/Json/Json.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Json
 {
diff --git a/library/Zend/Json/Server/Cache.php b/library/Zend/Json/Server/Cache.php
index 691092c0fb3..7bb69286377 100644
--- a/library/Zend/Json/Server/Cache.php
+++ b/library/Zend/Json/Server/Cache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cache extends \Zend\Server\Cache
 {
diff --git a/library/Zend/Json/Server/Client.php b/library/Zend/Json/Server/Client.php
index 4fdd66ff66c..4f89e656497 100644
--- a/library/Zend/Json/Server/Client.php
+++ b/library/Zend/Json/Server/Client.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Client implements ServerClient
 {
diff --git a/library/Zend/Json/Server/Error.php b/library/Zend/Json/Server/Error.php
index 0b660864449..3f005f579ca 100644
--- a/library/Zend/Json/Server/Error.php
+++ b/library/Zend/Json/Server/Error.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Error
 {
diff --git a/library/Zend/Json/Server/Exception/ErrorException.php b/library/Zend/Json/Server/Exception/ErrorException.php
index 6d12b16356e..ae9df6e70af 100644
--- a/library/Zend/Json/Server/Exception/ErrorException.php
+++ b/library/Zend/Json/Server/Exception/ErrorException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Exception;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorException extends Exception\BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Json/Server/Exception/ExceptionInterface.php b/library/Zend/Json/Server/Exception/ExceptionInterface.php
index 846a9e174a1..252830db9a6 100644
--- a/library/Zend/Json/Server/Exception/ExceptionInterface.php
+++ b/library/Zend/Json/Server/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Exception;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {}
diff --git a/library/Zend/Json/Server/Exception/HttpException.php b/library/Zend/Json/Server/Exception/HttpException.php
index 362588b0ea4..fba438b24f4 100644
--- a/library/Zend/Json/Server/Exception/HttpException.php
+++ b/library/Zend/Json/Server/Exception/HttpException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Exception;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpException extends RuntimeException
 {}
diff --git a/library/Zend/Json/Server/Exception/InvalidArgumentException.php b/library/Zend/Json/Server/Exception/InvalidArgumentException.php
index f7747dd0969..f54ad60a0c0 100644
--- a/library/Zend/Json/Server/Exception/InvalidArgumentException.php
+++ b/library/Zend/Json/Server/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Exception;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
diff --git a/library/Zend/Json/Server/Exception/RuntimeException.php b/library/Zend/Json/Server/Exception/RuntimeException.php
index 4e07d337a54..59cf66f3465 100644
--- a/library/Zend/Json/Server/Exception/RuntimeException.php
+++ b/library/Zend/Json/Server/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Exception;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends Exception\RuntimeException
diff --git a/library/Zend/Json/Server/Request.php b/library/Zend/Json/Server/Request.php
index 9fa2e1b7dea..75b6c8881b8 100644
--- a/library/Zend/Json/Server/Request.php
+++ b/library/Zend/Json/Server/Request.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Request
 {
diff --git a/library/Zend/Json/Server/Request/Http.php b/library/Zend/Json/Server/Request/Http.php
index e471800f22c..524765cbfd5 100644
--- a/library/Zend/Json/Server/Request/Http.php
+++ b/library/Zend/Json/Server/Request/Http.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Request;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Http extends JsonRequest
 {
diff --git a/library/Zend/Json/Server/Response.php b/library/Zend/Json/Server/Response.php
index fb6a9007011..345a8f01ab5 100644
--- a/library/Zend/Json/Server/Response.php
+++ b/library/Zend/Json/Server/Response.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Response
 {
diff --git a/library/Zend/Json/Server/Response/Http.php b/library/Zend/Json/Server/Response/Http.php
index 3d4b23cc9c4..62c8a79dc57 100644
--- a/library/Zend/Json/Server/Response/Http.php
+++ b/library/Zend/Json/Server/Response/Http.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Response;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Http extends JsonResponse
 {
diff --git a/library/Zend/Json/Server/Server.php b/library/Zend/Json/Server/Server.php
index 640080c22c1..27751ab2960 100644
--- a/library/Zend/Json/Server/Server.php
+++ b/library/Zend/Json/Server/Server.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -30,8 +28,6 @@
 /**
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Server extends AbstractServer
 {
diff --git a/library/Zend/Json/Server/Smd.php b/library/Zend/Json/Server/Smd.php
index 7634663eb8e..c491b7db870 100644
--- a/library/Zend/Json/Server/Smd.php
+++ b/library/Zend/Json/Server/Smd.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Smd
 {
diff --git a/library/Zend/Json/Server/Smd/Service.php b/library/Zend/Json/Server/Smd/Service.php
index c950ee49455..5821bce21a2 100644
--- a/library/Zend/Json/Server/Smd/Service.php
+++ b/library/Zend/Json/Server/Smd/Service.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Json\Server\Smd;
@@ -29,8 +27,6 @@
  * @todo       Revised method regex to allow NS; however, should SMD be revised to strip PHP NS instead when attaching functions?
  * @package    Zend_Json
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Service
 {
diff --git a/library/Zend/Ldap/Attribute.php b/library/Zend/Ldap/Attribute.php
index 1da5ed32162..e859978ede9 100644
--- a/library/Zend/Ldap/Attribute.php
+++ b/library/Zend/Ldap/Attribute.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Attribute
 {
diff --git a/library/Zend/Ldap/Collection.php b/library/Zend/Ldap/Collection.php
index e83c6d31dac..4773ab1d8a5 100644
--- a/library/Zend/Ldap/Collection.php
+++ b/library/Zend/Ldap/Collection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Collection implements \Iterator, \Countable
 {
diff --git a/library/Zend/Ldap/Collection/DefaultIterator.php b/library/Zend/Ldap/Collection/DefaultIterator.php
index 331679e1b9c..58157cce825 100644
--- a/library/Zend/Ldap/Collection/DefaultIterator.php
+++ b/library/Zend/Ldap/Collection/DefaultIterator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Collection;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultIterator implements \Iterator, \Countable
 {
diff --git a/library/Zend/Ldap/Converter/Converter.php b/library/Zend/Ldap/Converter/Converter.php
index 2ddd1e1cc34..1cff61caeed 100644
--- a/library/Zend/Ldap/Converter/Converter.php
+++ b/library/Zend/Ldap/Converter/Converter.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Ldap
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace Zend\Ldap\Converter;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Ldap
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 class Converter
 {
diff --git a/library/Zend/Ldap/Converter/Exception/ConverterException.php b/library/Zend/Ldap/Converter/Exception/ConverterException.php
index 46896135dc6..6821cf50280 100644
--- a/library/Zend/Ldap/Converter/Exception/ConverterException.php
+++ b/library/Zend/Ldap/Converter/Exception/ConverterException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Converter\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ConverterException extends \Exception implements ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php b/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
index 96d285be929..5d1502d103e 100644
--- a/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
+++ b/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Converter\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php b/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
index 0f97824fbbf..ac0103abd6d 100644
--- a/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Converter\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php b/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
index 1c8d45cc398..8e236951a56 100644
--- a/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Converter\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Dn.php b/library/Zend/Ldap/Dn.php
index 7e45d12b0d4..17631294786 100644
--- a/library/Zend/Ldap/Dn.php
+++ b/library/Zend/Ldap/Dn.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Dn implements \ArrayAccess
 {
diff --git a/library/Zend/Ldap/Exception/BadMethodCallException.php b/library/Zend/Ldap/Exception/BadMethodCallException.php
index 4763185b502..1000f3fcaef 100644
--- a/library/Zend/Ldap/Exception/BadMethodCallException.php
+++ b/library/Zend/Ldap/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Exception/ExceptionInterface.php b/library/Zend/Ldap/Exception/ExceptionInterface.php
index 0b79ef93335..ce646c39c54 100644
--- a/library/Zend/Ldap/Exception/ExceptionInterface.php
+++ b/library/Zend/Ldap/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Exception/InvalidArgumentException.php b/library/Zend/Ldap/Exception/InvalidArgumentException.php
index af04d288b22..14fdf62a578 100644
--- a/library/Zend/Ldap/Exception/InvalidArgumentException.php
+++ b/library/Zend/Ldap/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Exception/LdapException.php b/library/Zend/Ldap/Exception/LdapException.php
index 215c518eea0..bf2e7a3b097 100644
--- a/library/Zend/Ldap/Exception/LdapException.php
+++ b/library/Zend/Ldap/Exception/LdapException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LdapException extends \Exception implements ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Filter.php b/library/Zend/Ldap/Filter.php
index f2c0bfc74a7..10ff5647824 100644
--- a/library/Zend/Ldap/Filter.php
+++ b/library/Zend/Ldap/Filter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Filter extends Filter\StringFilter
 {
diff --git a/library/Zend/Ldap/Filter/AbstractFilter.php b/library/Zend/Ldap/Filter/AbstractFilter.php
index 11ae6fef6b5..35035200228 100644
--- a/library/Zend/Ldap/Filter/AbstractFilter.php
+++ b/library/Zend/Ldap/Filter/AbstractFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFilter
 {
diff --git a/library/Zend/Ldap/Filter/AbstractLogicalFilter.php b/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
index e53604cbc69..f7c8de3d741 100644
--- a/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
+++ b/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractLogicalFilter extends AbstractFilter
 {
diff --git a/library/Zend/Ldap/Filter/AndFilter.php b/library/Zend/Ldap/Filter/AndFilter.php
index 0d558f36d4f..f3d2b8c0e00 100644
--- a/library/Zend/Ldap/Filter/AndFilter.php
+++ b/library/Zend/Ldap/Filter/AndFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AndFilter extends AbstractLogicalFilter
 {
diff --git a/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php b/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
index 216f5788de1..f82be38d7ab 100644
--- a/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
+++ b/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends MainLdapException
 {
diff --git a/library/Zend/Ldap/Filter/Exception/FilterException.php b/library/Zend/Ldap/Filter/Exception/FilterException.php
index ad28762af6e..5834fe9f020 100644
--- a/library/Zend/Ldap/Filter/Exception/FilterException.php
+++ b/library/Zend/Ldap/Filter/Exception/FilterException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilterException extends \Exception implements ExceptionInterface
 {
diff --git a/library/Zend/Ldap/Filter/MaskFilter.php b/library/Zend/Ldap/Filter/MaskFilter.php
index cd5aefd064e..65ada10bb7b 100644
--- a/library/Zend/Ldap/Filter/MaskFilter.php
+++ b/library/Zend/Ldap/Filter/MaskFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MaskFilter extends StringFilter
 {
diff --git a/library/Zend/Ldap/Filter/NotFilter.php b/library/Zend/Ldap/Filter/NotFilter.php
index fac2be257f7..5997260e5e6 100644
--- a/library/Zend/Ldap/Filter/NotFilter.php
+++ b/library/Zend/Ldap/Filter/NotFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NotFilter extends AbstractFilter
 {
diff --git a/library/Zend/Ldap/Filter/OrFilter.php b/library/Zend/Ldap/Filter/OrFilter.php
index 0c1eec776dc..13df2c6ee34 100644
--- a/library/Zend/Ldap/Filter/OrFilter.php
+++ b/library/Zend/Ldap/Filter/OrFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OrFilter extends AbstractLogicalFilter
 {
diff --git a/library/Zend/Ldap/Filter/StringFilter.php b/library/Zend/Ldap/Filter/StringFilter.php
index b5547de3164..14f3684f177 100644
--- a/library/Zend/Ldap/Filter/StringFilter.php
+++ b/library/Zend/Ldap/Filter/StringFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StringFilter extends AbstractFilter
 {
diff --git a/library/Zend/Ldap/Ldap.php b/library/Zend/Ldap/Ldap.php
index 5f6da7d5ba9..7b38d6ef8fe 100644
--- a/library/Zend/Ldap/Ldap.php
+++ b/library/Zend/Ldap/Ldap.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ldap
 {
diff --git a/library/Zend/Ldap/Ldif/Encoder.php b/library/Zend/Ldap/Ldif/Encoder.php
index c683a3bda13..93227c9b0a5 100644
--- a/library/Zend/Ldap/Ldif/Encoder.php
+++ b/library/Zend/Ldap/Ldif/Encoder.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Ldif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Ldif;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Ldif
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Encoder
 {
diff --git a/library/Zend/Ldap/Node.php b/library/Zend/Ldap/Node.php
index 9f0628b44af..ab66b57c65c 100644
--- a/library/Zend/Ldap/Node.php
+++ b/library/Zend/Ldap/Node.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
 {
diff --git a/library/Zend/Ldap/Node/AbstractNode.php b/library/Zend/Ldap/Node/AbstractNode.php
index e218f124bf8..2a94eeb1b40 100644
--- a/library/Zend/Ldap/Node/AbstractNode.php
+++ b/library/Zend/Ldap/Node/AbstractNode.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractNode implements \ArrayAccess, \Countable
 {
diff --git a/library/Zend/Ldap/Node/ChildrenIterator.php b/library/Zend/Ldap/Node/ChildrenIterator.php
index 39044ecad93..a188de509cb 100644
--- a/library/Zend/Ldap/Node/ChildrenIterator.php
+++ b/library/Zend/Ldap/Node/ChildrenIterator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ChildrenIterator implements \Iterator, \Countable, \RecursiveIterator, \ArrayAccess
 {
diff --git a/library/Zend/Ldap/Node/Collection.php b/library/Zend/Ldap/Node/Collection.php
index e488ead209b..cc073f29d62 100644
--- a/library/Zend/Ldap/Node/Collection.php
+++ b/library/Zend/Ldap/Node/Collection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Node
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Collection extends Ldap\Collection
 {
diff --git a/library/Zend/Ldap/Node/RootDse.php b/library/Zend/Ldap/Node/RootDse.php
index 8deaf772350..ac2726ebf5a 100644
--- a/library/Zend/Ldap/Node/RootDse.php
+++ b/library/Zend/Ldap/Node/RootDse.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RootDse extends AbstractNode
 {
diff --git a/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
index 003e9e98e57..c0d911b3a63 100644
--- a/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\RootDse;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ActiveDirectory extends Node\RootDse
 {
diff --git a/library/Zend/Ldap/Node/RootDse/OpenLdap.php b/library/Zend/Ldap/Node/RootDse/OpenLdap.php
index 2af5350c521..6406eeb529c 100644
--- a/library/Zend/Ldap/Node/RootDse/OpenLdap.php
+++ b/library/Zend/Ldap/Node/RootDse/OpenLdap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\RootDse;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenLdap extends Node\RootDse
 {
diff --git a/library/Zend/Ldap/Node/RootDse/eDirectory.php b/library/Zend/Ldap/Node/RootDse/eDirectory.php
index 41d0c524d2f..fdf68c1514d 100644
--- a/library/Zend/Ldap/Node/RootDse/eDirectory.php
+++ b/library/Zend/Ldap/Node/RootDse/eDirectory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\RootDse;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage RootDse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class eDirectory extends Node\RootDse
 {
diff --git a/library/Zend/Ldap/Node/Schema.php b/library/Zend/Ldap/Node/Schema.php
index ef136c77a0b..12328828f11 100644
--- a/library/Zend/Ldap/Node/Schema.php
+++ b/library/Zend/Ldap/Node/Schema.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Schema extends AbstractNode
 {
diff --git a/library/Zend/Ldap/Node/Schema/AbstractItem.php b/library/Zend/Ldap/Node/Schema/AbstractItem.php
index 13570db449a..2f5daa77007 100644
--- a/library/Zend/Ldap/Node/Schema/AbstractItem.php
+++ b/library/Zend/Ldap/Node/Schema/AbstractItem.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractItem implements \ArrayAccess, \Countable
 {
diff --git a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
index 9a2b094d1fd..d49fc897c6f 100644
--- a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ActiveDirectory extends Node\Schema
 {
diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
index 6b1b53c7044..cce4785c3c9 100644
--- a/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema\AttributeType;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ActiveDirectory extends Schema\AbstractItem implements AttributeTypeInterface
 {
diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php b/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
index 9d90b6c7a31..138440b5c21 100644
--- a/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
+++ b/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema\AttributeType;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AttributeTypeInterface
 {
diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
index f09609cd171..d6938416cb5 100644
--- a/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
+++ b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema\AttributeType;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenLdap extends Schema\AbstractItem implements AttributeTypeInterface
 {
diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
index df1d24f49e6..9dc15dae84d 100644
--- a/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema\ObjectClass;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterface
 {
diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php b/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
index c37b4de63c4..a4a9bd1ab9b 100644
--- a/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
+++ b/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema\ObjectClass;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ObjectClassInterface
 {
diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
index 9bd83a01984..a5ad11b0459 100644
--- a/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
+++ b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema\ObjectClass;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenLdap extends Schema\AbstractItem implements ObjectClassInterface
 {
diff --git a/library/Zend/Ldap/Node/Schema/OpenLdap.php b/library/Zend/Ldap/Node/Schema/OpenLdap.php
index 9a438f7aaa3..81ed535e5a6 100644
--- a/library/Zend/Ldap/Node/Schema/OpenLdap.php
+++ b/library/Zend/Ldap/Node/Schema/OpenLdap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Ldap\Node\Schema;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Schema
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenLdap extends Node\Schema
 {
diff --git a/library/Zend/Loader/AutoloaderFactory.php b/library/Zend/Loader/AutoloaderFactory.php
index ab32bced67a..fb4f5907507 100644
--- a/library/Zend/Loader/AutoloaderFactory.php
+++ b/library/Zend/Loader/AutoloaderFactory.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 
@@ -28,8 +26,6 @@
 /**
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AutoloaderFactory
 {
diff --git a/library/Zend/Loader/ClassMapAutoloader.php b/library/Zend/Loader/ClassMapAutoloader.php
index 47fbef673c5..2408db33a22 100644
--- a/library/Zend/Loader/ClassMapAutoloader.php
+++ b/library/Zend/Loader/ClassMapAutoloader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader;
@@ -31,8 +29,6 @@
  * 
  * @catebory   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
  */
 class ClassMapAutoloader implements SplAutoloader
 {
diff --git a/library/Zend/Loader/Exception/BadMethodCallException.php b/library/Zend/Loader/Exception/BadMethodCallException.php
index 4cdb4550945..92c41bf1fa8 100644
--- a/library/Zend/Loader/Exception/BadMethodCallException.php
+++ b/library/Zend/Loader/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Loader/Exception/DomainException.php b/library/Zend/Loader/Exception/DomainException.php
index f5b7fad1028..39dfd4b39b2 100644
--- a/library/Zend/Loader/Exception/DomainException.php
+++ b/library/Zend/Loader/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {}
diff --git a/library/Zend/Loader/Exception/ExceptionInterface.php b/library/Zend/Loader/Exception/ExceptionInterface.php
index bed20e9cd46..2510e18418b 100644
--- a/library/Zend/Loader/Exception/ExceptionInterface.php
+++ b/library/Zend/Loader/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Loader/Exception/InvalidArgumentException.php b/library/Zend/Loader/Exception/InvalidArgumentException.php
index 982f4ad9b46..41c00793bd3 100644
--- a/library/Zend/Loader/Exception/InvalidArgumentException.php
+++ b/library/Zend/Loader/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Loader/Exception/InvalidPathException.php b/library/Zend/Loader/Exception/InvalidPathException.php
index 61e1674e0d0..84b9bb87f2d 100644
--- a/library/Zend/Loader/Exception/InvalidPathException.php
+++ b/library/Zend/Loader/Exception/InvalidPathException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidPathException extends \Exception implements ExceptionInterface
 {}
diff --git a/library/Zend/Loader/Exception/MissingResourceNamespaceException.php b/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
index 585f33d5395..2b0db7e10e0 100644
--- a/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
+++ b/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MissingResourceNamespaceException extends \Exception implements 
     ExceptionInterface
diff --git a/library/Zend/Loader/Exception/PluginLoaderException.php b/library/Zend/Loader/Exception/PluginLoaderException.php
index 75f1b1e29ac..5a662d74a24 100644
--- a/library/Zend/Loader/Exception/PluginLoaderException.php
+++ b/library/Zend/Loader/Exception/PluginLoaderException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PluginLoaderException extends DomainException
 {
diff --git a/library/Zend/Loader/Exception/RuntimeException.php b/library/Zend/Loader/Exception/RuntimeException.php
index f02c59d4dd8..06d4f84d3c1 100644
--- a/library/Zend/Loader/Exception/RuntimeException.php
+++ b/library/Zend/Loader/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/Loader/Exception/SecurityException.php b/library/Zend/Loader/Exception/SecurityException.php
index b98ca3ffdfc..e33dfb8518e 100644
--- a/library/Zend/Loader/Exception/SecurityException.php
+++ b/library/Zend/Loader/Exception/SecurityException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SecurityException extends DomainException
 {}
diff --git a/library/Zend/Loader/PluginClassLoader.php b/library/Zend/Loader/PluginClassLoader.php
index c479c043903..53ef46911ab 100644
--- a/library/Zend/Loader/PluginClassLoader.php
+++ b/library/Zend/Loader/PluginClassLoader.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PluginClassLoader implements PluginClassLocator
 {
diff --git a/library/Zend/Loader/PluginClassLocator.php b/library/Zend/Loader/PluginClassLocator.php
index 475bdeac1c4..7d3de2714c0 100644
--- a/library/Zend/Loader/PluginClassLocator.php
+++ b/library/Zend/Loader/PluginClassLocator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface PluginClassLocator extends ShortNameLocator, \IteratorAggregate
 {
diff --git a/library/Zend/Loader/PrefixPathLoader.php b/library/Zend/Loader/PrefixPathLoader.php
index f6fd662052a..4db19f32477 100644
--- a/library/Zend/Loader/PrefixPathLoader.php
+++ b/library/Zend/Loader/PrefixPathLoader.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PrefixPathLoader implements ShortNameLocator, PrefixPathMapper
 {
diff --git a/library/Zend/Loader/PrefixPathMapper.php b/library/Zend/Loader/PrefixPathMapper.php
index b0bd7d41fab..2618b326bcb 100644
--- a/library/Zend/Loader/PrefixPathMapper.php
+++ b/library/Zend/Loader/PrefixPathMapper.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface PrefixPathMapper extends ShortNameLocator
 {
diff --git a/library/Zend/Loader/ShortNameLocator.php b/library/Zend/Loader/ShortNameLocator.php
index 664cd5862ea..e8cd3954320 100644
--- a/library/Zend/Loader/ShortNameLocator.php
+++ b/library/Zend/Loader/ShortNameLocator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ShortNameLocator
 {
diff --git a/library/Zend/Loader/SplAutoloader.php b/library/Zend/Loader/SplAutoloader.php
index db39ff37d23..5e070f4d7ea 100644
--- a/library/Zend/Loader/SplAutoloader.php
+++ b/library/Zend/Loader/SplAutoloader.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader;
@@ -27,8 +25,6 @@
  * registry
  *
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface SplAutoloader
 {
diff --git a/library/Zend/Loader/StandardAutoloader.php b/library/Zend/Loader/StandardAutoloader.php
index bbb118fb2c5..3fc0414b397 100644
--- a/library/Zend/Loader/StandardAutoloader.php
+++ b/library/Zend/Loader/StandardAutoloader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Loader;
@@ -32,7 +30,6 @@
  * class is not found, a PHP warning will be raised by include().
  *
  * @package    Zend_Loader
- * @license New BSD {@link http://framework.zend.com/license/new-bsd}
  */
 class StandardAutoloader implements SplAutoloader
 {
diff --git a/library/Zend/Log/Exception/ExceptionInterface.php b/library/Zend/Log/Exception/ExceptionInterface.php
index c1e899504f6..848648f9fa6 100644
--- a/library/Zend/Log/Exception/ExceptionInterface.php
+++ b/library/Zend/Log/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Log/Exception/InvalidArgumentException.php b/library/Zend/Log/Exception/InvalidArgumentException.php
index 92776eb4fc9..0b9ccefc2f4 100644
--- a/library/Zend/Log/Exception/InvalidArgumentException.php
+++ b/library/Zend/Log/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Log/Exception/RuntimeException.php b/library/Zend/Log/Exception/RuntimeException.php
index 810702567be..387761ccec2 100644
--- a/library/Zend/Log/Exception/RuntimeException.php
+++ b/library/Zend/Log/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Log/Filter/FilterInterface.php b/library/Zend/Log/Filter/FilterInterface.php
index 0a2a6233e79..e52fe7baa17 100644
--- a/library/Zend/Log/Filter/FilterInterface.php
+++ b/library/Zend/Log/Filter/FilterInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Filter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FilterInterface
 {
diff --git a/library/Zend/Log/Filter/Priority.php b/library/Zend/Log/Filter/Priority.php
index 565efe42771..91016532332 100644
--- a/library/Zend/Log/Filter/Priority.php
+++ b/library/Zend/Log/Filter/Priority.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Priority implements FilterInterface
 {
diff --git a/library/Zend/Log/Filter/Regex.php b/library/Zend/Log/Filter/Regex.php
index f5cd1308196..1453069c92a 100644
--- a/library/Zend/Log/Filter/Regex.php
+++ b/library/Zend/Log/Filter/Regex.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Regex implements FilterInterface
 {
diff --git a/library/Zend/Log/Filter/SuppressFilter.php b/library/Zend/Log/Filter/SuppressFilter.php
index 662d2a2c878..68c987e9ef8 100644
--- a/library/Zend/Log/Filter/SuppressFilter.php
+++ b/library/Zend/Log/Filter/SuppressFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Filter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SuppressFilter implements FilterInterface
 {
diff --git a/library/Zend/Log/Filter/Validator.php b/library/Zend/Log/Filter/Validator.php
index 2df9de907db..d92fc4c0d24 100644
--- a/library/Zend/Log/Filter/Validator.php
+++ b/library/Zend/Log/Filter/Validator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Filter;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Filter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Validator implements FilterInterface
 {
diff --git a/library/Zend/Log/Formatter/ErrorHandler.php b/library/Zend/Log/Formatter/ErrorHandler.php
index f1d6e9645d6..9235a5bc555 100644
--- a/library/Zend/Log/Formatter/ErrorHandler.php
+++ b/library/Zend/Log/Formatter/ErrorHandler.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Formatter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorHandler implements FormatterInterface
 {
diff --git a/library/Zend/Log/Formatter/ExceptionHandler.php b/library/Zend/Log/Formatter/ExceptionHandler.php
index 7937d1521f4..200b0ee45bd 100644
--- a/library/Zend/Log/Formatter/ExceptionHandler.php
+++ b/library/Zend/Log/Formatter/ExceptionHandler.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Formatter;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExceptionHandler implements FormatterInterface
 {
diff --git a/library/Zend/Log/Formatter/FormatterInterface.php b/library/Zend/Log/Formatter/FormatterInterface.php
index 1e85a95c920..86f1df8cc2a 100644
--- a/library/Zend/Log/Formatter/FormatterInterface.php
+++ b/library/Zend/Log/Formatter/FormatterInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Formatter;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FormatterInterface
 {
diff --git a/library/Zend/Log/Formatter/Simple.php b/library/Zend/Log/Formatter/Simple.php
index 9e1343cb2e7..54430cdc789 100644
--- a/library/Zend/Log/Formatter/Simple.php
+++ b/library/Zend/Log/Formatter/Simple.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Formatter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Simple implements FormatterInterface
 {
diff --git a/library/Zend/Log/Formatter/Xml.php b/library/Zend/Log/Formatter/Xml.php
index 616eeb4e004..adad67c699c 100644
--- a/library/Zend/Log/Formatter/Xml.php
+++ b/library/Zend/Log/Formatter/Xml.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Formatter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Xml implements FormatterInterface
 {
diff --git a/library/Zend/Log/Logger.php b/library/Zend/Log/Logger.php
index 914240a47ed..c8e228293fc 100644
--- a/library/Zend/Log/Logger.php
+++ b/library/Zend/Log/Logger.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Logger implements LoggerInterface
 {
diff --git a/library/Zend/Log/LoggerAwareInterface.php b/library/Zend/Log/LoggerAwareInterface.php
index cfb2c9fcebb..df8f37bf658 100644
--- a/library/Zend/Log/LoggerAwareInterface.php
+++ b/library/Zend/Log/LoggerAwareInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface LoggerAwareInterface
 {
diff --git a/library/Zend/Log/LoggerInterface.php b/library/Zend/Log/LoggerInterface.php
index 394302b32cc..f02eacf45a7 100644
--- a/library/Zend/Log/LoggerInterface.php
+++ b/library/Zend/Log/LoggerInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface LoggerInterface
 {
diff --git a/library/Zend/Log/Writer/AbstractWriter.php b/library/Zend/Log/Writer/AbstractWriter.php
index be2e10914b9..56438734796 100644
--- a/library/Zend/Log/Writer/AbstractWriter.php
+++ b/library/Zend/Log/Writer/AbstractWriter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractWriter implements WriterInterface
 {
diff --git a/library/Zend/Log/Writer/Db.php b/library/Zend/Log/Writer/Db.php
index e7e2cd0d4c1..0520b49b944 100644
--- a/library/Zend/Log/Writer/Db.php
+++ b/library/Zend/Log/Writer/Db.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Db extends AbstractWriter
 {
diff --git a/library/Zend/Log/Writer/Mail.php b/library/Zend/Log/Writer/Mail.php
index a50cc54f15b..93c0f8a2fe7 100644
--- a/library/Zend/Log/Writer/Mail.php
+++ b/library/Zend/Log/Writer/Mail.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -39,8 +37,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mail extends AbstractWriter
 {
diff --git a/library/Zend/Log/Writer/Mock.php b/library/Zend/Log/Writer/Mock.php
index 17c441a2aeb..0cab7c65f6c 100644
--- a/library/Zend/Log/Writer/Mock.php
+++ b/library/Zend/Log/Writer/Mock.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mock extends AbstractWriter
 {
diff --git a/library/Zend/Log/Writer/Null.php b/library/Zend/Log/Writer/Null.php
index dba17aeb10c..38a55b88568 100644
--- a/library/Zend/Log/Writer/Null.php
+++ b/library/Zend/Log/Writer/Null.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Null extends AbstractWriter
 {
diff --git a/library/Zend/Log/Writer/Stream.php b/library/Zend/Log/Writer/Stream.php
index 84234a9b9df..ba2be796786 100644
--- a/library/Zend/Log/Writer/Stream.php
+++ b/library/Zend/Log/Writer/Stream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Stream extends AbstractWriter
 {
diff --git a/library/Zend/Log/Writer/Syslog.php b/library/Zend/Log/Writer/Syslog.php
index dca550ca7a9..bb9c4485ac4 100644
--- a/library/Zend/Log/Writer/Syslog.php
+++ b/library/Zend/Log/Writer/Syslog.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Syslog extends AbstractWriter
 {
diff --git a/library/Zend/Log/Writer/WriterInterface.php b/library/Zend/Log/Writer/WriterInterface.php
index 83ab5a50c70..b6afd34c74a 100644
--- a/library/Zend/Log/Writer/WriterInterface.php
+++ b/library/Zend/Log/Writer/WriterInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface WriterInterface
 {
diff --git a/library/Zend/Log/Writer/ZendMonitor.php b/library/Zend/Log/Writer/ZendMonitor.php
index cbd4097d07c..014da7db806 100644
--- a/library/Zend/Log/Writer/ZendMonitor.php
+++ b/library/Zend/Log/Writer/ZendMonitor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log\Writer;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZendMonitor extends AbstractWriter
 {
diff --git a/library/Zend/Log/WriterPluginManager.php b/library/Zend/Log/WriterPluginManager.php
index 65795764843..8f6027ffb62 100644
--- a/library/Zend/Log/WriterPluginManager.php
+++ b/library/Zend/Log/WriterPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Log;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WriterPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Mail/Address.php b/library/Zend/Mail/Address.php
index a6b1e4ea879..da15eeaa10f 100644
--- a/library/Zend/Mail/Address.php
+++ b/library/Zend/Mail/Address.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Address implements Address\AddressInterface
 {
diff --git a/library/Zend/Mail/Address/AddressInterface.php b/library/Zend/Mail/Address/AddressInterface.php
index 954ff672fa5..9f54e081593 100644
--- a/library/Zend/Mail/Address/AddressInterface.php
+++ b/library/Zend/Mail/Address/AddressInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Address
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Address;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Address
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AddressInterface
 {
diff --git a/library/Zend/Mail/AddressList.php b/library/Zend/Mail/AddressList.php
index 1e721659a9c..904257631a7 100644
--- a/library/Zend/Mail/AddressList.php
+++ b/library/Zend/Mail/AddressList.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AddressList implements Countable, Iterator
 {
diff --git a/library/Zend/Mail/Exception/BadMethodCallException.php b/library/Zend/Mail/Exception/BadMethodCallException.php
index bbc601b6c1f..0532e1c2d92 100644
--- a/library/Zend/Mail/Exception/BadMethodCallException.php
+++ b/library/Zend/Mail/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Exception/DomainException.php b/library/Zend/Mail/Exception/DomainException.php
index f5872a382cb..7065275c450 100644
--- a/library/Zend/Mail/Exception/DomainException.php
+++ b/library/Zend/Mail/Exception/DomainException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException
     extends \DomainException
diff --git a/library/Zend/Mail/Exception/ExceptionInterface.php b/library/Zend/Mail/Exception/ExceptionInterface.php
index a7a56b0c612..69235c39d09 100644
--- a/library/Zend/Mail/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Mail/Exception/InvalidArgumentException.php b/library/Zend/Mail/Exception/InvalidArgumentException.php
index 7e7db63b700..56f49aed0d7 100644
--- a/library/Zend/Mail/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Mail/Exception/OutOfBoundsException.php b/library/Zend/Mail/Exception/OutOfBoundsException.php
index 3ed13bf76d7..680b5d40b7a 100644
--- a/library/Zend/Mail/Exception/OutOfBoundsException.php
+++ b/library/Zend/Mail/Exception/OutOfBoundsException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException
     extends \OutOfBoundsException
diff --git a/library/Zend/Mail/Exception/RuntimeException.php b/library/Zend/Mail/Exception/RuntimeException.php
index b644a3d66ab..7abd6358665 100644
--- a/library/Zend/Mail/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Mail/Header/AbstractAddressList.php b/library/Zend/Mail/Header/AbstractAddressList.php
index abb76391972..54ba38759d9 100644
--- a/library/Zend/Mail/Header/AbstractAddressList.php
+++ b/library/Zend/Mail/Header/AbstractAddressList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAddressList implements HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/Bcc.php b/library/Zend/Mail/Header/Bcc.php
index 6df7fa3e427..7ce84f06bdb 100644
--- a/library/Zend/Mail/Header/Bcc.php
+++ b/library/Zend/Mail/Header/Bcc.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Bcc extends AbstractAddressList
 {
diff --git a/library/Zend/Mail/Header/Cc.php b/library/Zend/Mail/Header/Cc.php
index 7c82d501191..747afc75758 100644
--- a/library/Zend/Mail/Header/Cc.php
+++ b/library/Zend/Mail/Header/Cc.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cc extends AbstractAddressList
 {
diff --git a/library/Zend/Mail/Header/ContentType.php b/library/Zend/Mail/Header/ContentType.php
old mode 100755
new mode 100644
index c8dda207f6e..ecc918acca5
--- a/library/Zend/Mail/Header/ContentType.php
+++ b/library/Zend/Mail/Header/ContentType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ContentType implements HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/Date.php b/library/Zend/Mail/Header/Date.php
index d6d93360726..7e999a7f594 100644
--- a/library/Zend/Mail/Header/Date.php
+++ b/library/Zend/Mail/Header/Date.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Date implements HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/Exception/BadMethodCallException.php b/library/Zend/Mail/Header/Exception/BadMethodCallException.php
index 802929584c7..8075c87c630 100644
--- a/library/Zend/Mail/Header/Exception/BadMethodCallException.php
+++ b/library/Zend/Mail/Header/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException 
     extends Exception\BadMethodCallException
diff --git a/library/Zend/Mail/Header/Exception/ExceptionInterface.php b/library/Zend/Mail/Header/Exception/ExceptionInterface.php
index 97486cbd80f..845643a01a8 100644
--- a/library/Zend/Mail/Header/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Header/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends MailException
 {
diff --git a/library/Zend/Mail/Header/Exception/InvalidArgumentException.php b/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
index c2bdee964b1..33841f00b04 100644
--- a/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Header/Exception/RuntimeException.php b/library/Zend/Mail/Header/Exception/RuntimeException.php
index 1b4c1a038bc..bff2a3022b6 100644
--- a/library/Zend/Mail/Header/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Header/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Header/From.php b/library/Zend/Mail/Header/From.php
index 29329c65175..a8e6d3890c9 100644
--- a/library/Zend/Mail/Header/From.php
+++ b/library/Zend/Mail/Header/From.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class From extends AbstractAddressList
 {
diff --git a/library/Zend/Mail/Header/GenericHeader.php b/library/Zend/Mail/Header/GenericHeader.php
index 5d8fee21a6b..0c0ef64f706 100644
--- a/library/Zend/Mail/Header/GenericHeader.php
+++ b/library/Zend/Mail/Header/GenericHeader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericHeader implements HeaderInterface, UnstructuredInterface
 {
diff --git a/library/Zend/Mail/Header/GenericMultiHeader.php b/library/Zend/Mail/Header/GenericMultiHeader.php
index 66f79e619c2..b28c2384294 100644
--- a/library/Zend/Mail/Header/GenericMultiHeader.php
+++ b/library/Zend/Mail/Header/GenericMultiHeader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericMultiHeader extends GenericHeader implements MultipleHeadersInterface
 {
diff --git a/library/Zend/Mail/Header/HeaderInterface.php b/library/Zend/Mail/Header/HeaderInterface.php
index c3b40836bd2..3a3326bf4ba 100644
--- a/library/Zend/Mail/Header/HeaderInterface.php
+++ b/library/Zend/Mail/Header/HeaderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/HeaderLoader.php b/library/Zend/Mail/Header/HeaderLoader.php
index 6f8d514d516..86f652a3ccb 100644
--- a/library/Zend/Mail/Header/HeaderLoader.php
+++ b/library/Zend/Mail/Header/HeaderLoader.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Mail
  */
 
@@ -18,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HeaderLoader extends PluginClassLoader
 {
@@ -45,4 +41,4 @@ class HeaderLoader extends PluginClassLoader
         'subject'      => 'Zend\Mail\Header\Subject',
         'to'           => 'Zend\Mail\Header\To',
     );
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Mail/Header/HeaderWrap.php b/library/Zend/Mail/Header/HeaderWrap.php
index 7c2dfee947e..c16df94a4d9 100644
--- a/library/Zend/Mail/Header/HeaderWrap.php
+++ b/library/Zend/Mail/Header/HeaderWrap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class HeaderWrap
 {
diff --git a/library/Zend/Mail/Header/MimeVersion.php b/library/Zend/Mail/Header/MimeVersion.php
index a3016ec0598..8f8b12bf273 100644
--- a/library/Zend/Mail/Header/MimeVersion.php
+++ b/library/Zend/Mail/Header/MimeVersion.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MimeVersion implements HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/MultipleHeadersInterface.php b/library/Zend/Mail/Header/MultipleHeadersInterface.php
index 00a90e21c24..a9315ef08a3 100644
--- a/library/Zend/Mail/Header/MultipleHeadersInterface.php
+++ b/library/Zend/Mail/Header/MultipleHeadersInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface MultipleHeadersInterface extends HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/Received.php b/library/Zend/Mail/Header/Received.php
index 8d905a7d382..1a9e70367b6 100644
--- a/library/Zend/Mail/Header/Received.php
+++ b/library/Zend/Mail/Header/Received.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Received implements HeaderInterface, MultipleHeadersInterface
 {
diff --git a/library/Zend/Mail/Header/ReplyTo.php b/library/Zend/Mail/Header/ReplyTo.php
index 0958329181b..5b7ed79298e 100644
--- a/library/Zend/Mail/Header/ReplyTo.php
+++ b/library/Zend/Mail/Header/ReplyTo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReplyTo extends AbstractAddressList
 {
diff --git a/library/Zend/Mail/Header/Sender.php b/library/Zend/Mail/Header/Sender.php
index 4e86aa94b00..bd0dcb24f1f 100644
--- a/library/Zend/Mail/Header/Sender.php
+++ b/library/Zend/Mail/Header/Sender.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sender implements HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/StructuredInterface.php b/library/Zend/Mail/Header/StructuredInterface.php
index 9174f6671a8..19dc9f93c41 100644
--- a/library/Zend/Mail/Header/StructuredInterface.php
+++ b/library/Zend/Mail/Header/StructuredInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StructuredInterface extends HeaderInterface
 {
diff --git a/library/Zend/Mail/Header/Subject.php b/library/Zend/Mail/Header/Subject.php
index 462e940890d..5adf0dd0a31 100644
--- a/library/Zend/Mail/Header/Subject.php
+++ b/library/Zend/Mail/Header/Subject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Subject implements UnstructuredInterface
 {
diff --git a/library/Zend/Mail/Header/To.php b/library/Zend/Mail/Header/To.php
index b2126e05b8d..521bdbf8d3b 100644
--- a/library/Zend/Mail/Header/To.php
+++ b/library/Zend/Mail/Header/To.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class To extends AbstractAddressList
 {
diff --git a/library/Zend/Mail/Header/UnstructuredInterface.php b/library/Zend/Mail/Header/UnstructuredInterface.php
index 52a6a0b8b5f..9a2b63125f3 100644
--- a/library/Zend/Mail/Header/UnstructuredInterface.php
+++ b/library/Zend/Mail/Header/UnstructuredInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Header;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface UnstructuredInterface extends HeaderInterface
 {
diff --git a/library/Zend/Mail/Headers.php b/library/Zend/Mail/Headers.php
index 4fe4687de51..435b494ea5c 100644
--- a/library/Zend/Mail/Headers.php
+++ b/library/Zend/Mail/Headers.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Header
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Headers implements Iterator, Countable
 {
diff --git a/library/Zend/Mail/Message.php b/library/Zend/Mail/Message.php
index f770fc707ad..a1cb00522a1 100644
--- a/library/Zend/Mail/Message.php
+++ b/library/Zend/Mail/Message.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Message
 {
diff --git a/library/Zend/Mail/Protocol/AbstractProtocol.php b/library/Zend/Mail/Protocol/AbstractProtocol.php
index b723e6a5a9a..859311debfa 100644
--- a/library/Zend/Mail/Protocol/AbstractProtocol.php
+++ b/library/Zend/Mail/Protocol/AbstractProtocol.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @todo Implement proxy settings
  */
 abstract class AbstractProtocol
diff --git a/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php b/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
index 821fb0dc46f..d474cccb211 100644
--- a/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends MailException
 {
diff --git a/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php b/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
index ef558996a5d..13d4da55d72 100644
--- a/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol\Exception;
@@ -28,10 +26,8 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Mail/Protocol/Exception/RuntimeException.php b/library/Zend/Mail/Protocol/Exception/RuntimeException.php
index 82b9d7e939c..4b0d7f0aef2 100644
--- a/library/Zend/Mail/Protocol/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Protocol/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Protocol/Imap.php b/library/Zend/Mail/Protocol/Imap.php
index a07d2eba1cc..2e02f657c96 100644
--- a/library/Zend/Mail/Protocol/Imap.php
+++ b/library/Zend/Mail/Protocol/Imap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Imap
 {
diff --git a/library/Zend/Mail/Protocol/Pop3.php b/library/Zend/Mail/Protocol/Pop3.php
index 99cb30bca55..10bcce4a0ff 100644
--- a/library/Zend/Mail/Protocol/Pop3.php
+++ b/library/Zend/Mail/Protocol/Pop3.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Pop3
 {
diff --git a/library/Zend/Mail/Protocol/Smtp.php b/library/Zend/Mail/Protocol/Smtp.php
index fd4810d891f..b293aacf9bf 100644
--- a/library/Zend/Mail/Protocol/Smtp.php
+++ b/library/Zend/Mail/Protocol/Smtp.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Smtp extends AbstractProtocol
 {
diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
index 29216552234..374ccb4c2ca 100644
--- a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
+++ b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol\Smtp\Auth;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Crammd5 extends Smtp
 {
diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
index 5468882c2d2..84c891edd08 100644
--- a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
+++ b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol\Smtp\Auth;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Login extends Smtp
 {
diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
index 7540ef0416a..396d6529013 100644
--- a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
+++ b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol\Smtp\Auth;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Plain extends Smtp
 {
diff --git a/library/Zend/Mail/Protocol/SmtpPluginManager.php b/library/Zend/Mail/Protocol/SmtpPluginManager.php
index 4d278fba575..3f0cdbd5833 100644
--- a/library/Zend/Mail/Protocol/SmtpPluginManager.php
+++ b/library/Zend/Mail/Protocol/SmtpPluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Protocol;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SmtpPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Mail/Storage.php b/library/Zend/Mail/Storage.php
index ca8962c67b5..5c667745202 100644
--- a/library/Zend/Mail/Storage.php
+++ b/library/Zend/Mail/Storage.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Storage
 {
diff --git a/library/Zend/Mail/Storage/AbstractStorage.php b/library/Zend/Mail/Storage/AbstractStorage.php
index 75cbe58ec2e..2d925e9ba81 100644
--- a/library/Zend/Mail/Storage/AbstractStorage.php
+++ b/library/Zend/Mail/Storage/AbstractStorage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractStorage implements Countable, ArrayAccess, SeekableIterator
 {
diff --git a/library/Zend/Mail/Storage/Exception/ExceptionInterface.php b/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
index 421c4bce635..4c92b16da2e 100644
--- a/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends MailException
 {
diff --git a/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php b/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
index ca977473d66..3a9801019fd 100644
--- a/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php b/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
index fe98c029994..7a757bc7d7b 100644
--- a/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
+++ b/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
@@ -15,9 +15,7 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Exception;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends Exception\OutOfBoundsException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Storage/Exception/RuntimeException.php b/library/Zend/Mail/Storage/Exception/RuntimeException.php
index ab30c101d61..094ed69ec22 100644
--- a/library/Zend/Mail/Storage/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Storage/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Storage/Folder.php b/library/Zend/Mail/Storage/Folder.php
index e49fe393589..bd014a3d5db 100644
--- a/library/Zend/Mail/Storage/Folder.php
+++ b/library/Zend/Mail/Storage/Folder.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Folder implements \RecursiveIterator
 {
diff --git a/library/Zend/Mail/Storage/Folder/FolderInterface.php b/library/Zend/Mail/Storage/Folder/FolderInterface.php
index 27bf6c356cb..1ef997b5b1b 100644
--- a/library/Zend/Mail/Storage/Folder/FolderInterface.php
+++ b/library/Zend/Mail/Storage/Folder/FolderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Folder;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FolderInterface
 {
diff --git a/library/Zend/Mail/Storage/Folder/Maildir.php b/library/Zend/Mail/Storage/Folder/Maildir.php
index 129b9ca7f3f..032c9a60f1f 100644
--- a/library/Zend/Mail/Storage/Folder/Maildir.php
+++ b/library/Zend/Mail/Storage/Folder/Maildir.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Folder;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Maildir extends Storage\Maildir implements FolderInterface
 {
diff --git a/library/Zend/Mail/Storage/Folder/Mbox.php b/library/Zend/Mail/Storage/Folder/Mbox.php
index 42b469647c3..fc62fcd4727 100644
--- a/library/Zend/Mail/Storage/Folder/Mbox.php
+++ b/library/Zend/Mail/Storage/Folder/Mbox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Folder;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mbox extends Storage\Mbox implements FolderInterface
 {
diff --git a/library/Zend/Mail/Storage/Imap.php b/library/Zend/Mail/Storage/Imap.php
index 7e70577a9db..b1fa0579e61 100644
--- a/library/Zend/Mail/Storage/Imap.php
+++ b/library/Zend/Mail/Storage/Imap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\WritableInterface
 {
diff --git a/library/Zend/Mail/Storage/Maildir.php b/library/Zend/Mail/Storage/Maildir.php
index 788cca3f61f..84a5579b8b7 100644
--- a/library/Zend/Mail/Storage/Maildir.php
+++ b/library/Zend/Mail/Storage/Maildir.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Maildir extends AbstractStorage
 {
diff --git a/library/Zend/Mail/Storage/Mbox.php b/library/Zend/Mail/Storage/Mbox.php
index 72b4b397890..13e69af58cd 100644
--- a/library/Zend/Mail/Storage/Mbox.php
+++ b/library/Zend/Mail/Storage/Mbox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mbox extends AbstractStorage
 {
diff --git a/library/Zend/Mail/Storage/Message.php b/library/Zend/Mail/Storage/Message.php
index b5ce4812a9f..036976bdb1d 100644
--- a/library/Zend/Mail/Storage/Message.php
+++ b/library/Zend/Mail/Storage/Message.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Message extends Part implements Message\MessageInterface
 {
diff --git a/library/Zend/Mail/Storage/Message/File.php b/library/Zend/Mail/Storage/Message/File.php
index a1d7e44bbc4..74208d868ec 100644
--- a/library/Zend/Mail/Storage/Message/File.php
+++ b/library/Zend/Mail/Storage/Message/File.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Message;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class File extends Part\File implements MessageInterface
 {
diff --git a/library/Zend/Mail/Storage/Message/MessageInterface.php b/library/Zend/Mail/Storage/Message/MessageInterface.php
index f9745a34b9f..e9d1360bec1 100644
--- a/library/Zend/Mail/Storage/Message/MessageInterface.php
+++ b/library/Zend/Mail/Storage/Message/MessageInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Message;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface MessageInterface
 {
diff --git a/library/Zend/Mail/Storage/Part.php b/library/Zend/Mail/Storage/Part.php
index 38c9b164567..9b2676bf60c 100644
--- a/library/Zend/Mail/Storage/Part.php
+++ b/library/Zend/Mail/Storage/Part.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Part implements RecursiveIterator, Part\PartInterface
 {
diff --git a/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php b/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
index 644e6b34b6c..14bd74cb854 100644
--- a/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends StorageException
 {
diff --git a/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php b/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
index 394fbb05fe1..475d8ce1df6 100644
--- a/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
@@ -15,9 +15,7 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Part\Exception;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php b/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
index 96eb3cdd735..f0dde9496f9 100644
--- a/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
@@ -15,9 +15,7 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Part\Exception;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @subpackage Storage
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Storage/Part/File.php b/library/Zend/Mail/Storage/Part/File.php
index a487d2ede87..7fcd98b4751 100644
--- a/library/Zend/Mail/Storage/Part/File.php
+++ b/library/Zend/Mail/Storage/Part/File.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Part;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class File extends Part
 {
diff --git a/library/Zend/Mail/Storage/Part/PartInterface.php b/library/Zend/Mail/Storage/Part/PartInterface.php
index 9465e0ee2de..a11beb8c0dc 100644
--- a/library/Zend/Mail/Storage/Part/PartInterface.php
+++ b/library/Zend/Mail/Storage/Part/PartInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Part;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface PartInterface extends RecursiveIterator
 {
diff --git a/library/Zend/Mail/Storage/Pop3.php b/library/Zend/Mail/Storage/Pop3.php
index a79c53a7428..bafc52121bc 100644
--- a/library/Zend/Mail/Storage/Pop3.php
+++ b/library/Zend/Mail/Storage/Pop3.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Pop3 extends AbstractStorage
 {
diff --git a/library/Zend/Mail/Storage/Writable/Maildir.php b/library/Zend/Mail/Storage/Writable/Maildir.php
index 3af46c2982a..5a2c0625ce3 100644
--- a/library/Zend/Mail/Storage/Writable/Maildir.php
+++ b/library/Zend/Mail/Storage/Writable/Maildir.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Writable;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Maildir extends Folder\Maildir implements WritableInterface
 {
diff --git a/library/Zend/Mail/Storage/Writable/WritableInterface.php b/library/Zend/Mail/Storage/Writable/WritableInterface.php
index 7d2a73a2c49..e26b97cf89e 100644
--- a/library/Zend/Mail/Storage/Writable/WritableInterface.php
+++ b/library/Zend/Mail/Storage/Writable/WritableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Storage\Writable;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface WritableInterface
 {
diff --git a/library/Zend/Mail/Transport/Exception/ExceptionInterface.php b/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
index e020b5df543..0a50f91acf7 100644
--- a/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends MailException
 {
diff --git a/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php b/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
index 3dbd6fdc3d0..f77dc277e7c 100644
--- a/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Transport/Exception/RuntimeException.php b/library/Zend/Mail/Transport/Exception/RuntimeException.php
index ef7f559ee8d..4f645badf6f 100644
--- a/library/Zend/Mail/Transport/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Transport/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Mail/Transport/File.php b/library/Zend/Mail/Transport/File.php
index 92a03eec17c..6fe0931080b 100644
--- a/library/Zend/Mail/Transport/File.php
+++ b/library/Zend/Mail/Transport/File.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class File implements TransportInterface
 {
diff --git a/library/Zend/Mail/Transport/FileOptions.php b/library/Zend/Mail/Transport/FileOptions.php
index ed96166b92a..615d37fb78a 100644
--- a/library/Zend/Mail/Transport/FileOptions.php
+++ b/library/Zend/Mail/Transport/FileOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FileOptions extends AbstractOptions
 {
diff --git a/library/Zend/Mail/Transport/Sendmail.php b/library/Zend/Mail/Transport/Sendmail.php
index 0ad3deadd62..249a3092484 100644
--- a/library/Zend/Mail/Transport/Sendmail.php
+++ b/library/Zend/Mail/Transport/Sendmail.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sendmail implements TransportInterface
 {
diff --git a/library/Zend/Mail/Transport/Smtp.php b/library/Zend/Mail/Transport/Smtp.php
index f463c775621..983378de3bb 100644
--- a/library/Zend/Mail/Transport/Smtp.php
+++ b/library/Zend/Mail/Transport/Smtp.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Smtp implements TransportInterface
 {
diff --git a/library/Zend/Mail/Transport/SmtpOptions.php b/library/Zend/Mail/Transport/SmtpOptions.php
index 8738dba2f02..23dbbddd3cb 100644
--- a/library/Zend/Mail/Transport/SmtpOptions.php
+++ b/library/Zend/Mail/Transport/SmtpOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SmtpOptions extends AbstractOptions
 {
diff --git a/library/Zend/Mail/Transport/TransportInterface.php b/library/Zend/Mail/Transport/TransportInterface.php
index 5162b02ba2d..65d557abe29 100644
--- a/library/Zend/Mail/Transport/TransportInterface.php
+++ b/library/Zend/Mail/Transport/TransportInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mail\Transport;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Transport
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TransportInterface
 {
diff --git a/library/Zend/Markup/Exception/ExceptionInterface.php b/library/Zend/Markup/Exception/ExceptionInterface.php
index e7d985dea23..99f0dc66a78 100644
--- a/library/Zend/Markup/Exception/ExceptionInterface.php
+++ b/library/Zend/Markup/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Exception;
diff --git a/library/Zend/Markup/Exception/InvalidArgumentException.php b/library/Zend/Markup/Exception/InvalidArgumentException.php
index 7c642bd745c..321b9d6da5b 100644
--- a/library/Zend/Markup/Exception/InvalidArgumentException.php
+++ b/library/Zend/Markup/Exception/InvalidArgumentException.php
@@ -5,4 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Markup/Exception/RuntimeException.php b/library/Zend/Markup/Exception/RuntimeException.php
index f3d974be5d0..b7251279566 100644
--- a/library/Zend/Markup/Exception/RuntimeException.php
+++ b/library/Zend/Markup/Exception/RuntimeException.php
@@ -5,4 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Markup/Markup.php b/library/Zend/Markup/Markup.php
index 5a64f2033b5..0de73453609 100644
--- a/library/Zend/Markup/Markup.php
+++ b/library/Zend/Markup/Markup.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Markup
 {
diff --git a/library/Zend/Markup/Parser/Bbcode.php b/library/Zend/Markup/Parser/Bbcode.php
index c1d6eb8b612..b2ea33fdd76 100644
--- a/library/Zend/Markup/Parser/Bbcode.php
+++ b/library/Zend/Markup/Parser/Bbcode.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Parser;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Bbcode implements ParserInterface
 {
diff --git a/library/Zend/Markup/Parser/Exception/ExceptionInterface.php b/library/Zend/Markup/Parser/Exception/ExceptionInterface.php
index e81bcf1f0b9..d4c67862f7f 100644
--- a/library/Zend/Markup/Parser/Exception/ExceptionInterface.php
+++ b/library/Zend/Markup/Parser/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Parser\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/Markup/Parser/Exception/InvalidArgumentException.php b/library/Zend/Markup/Parser/Exception/InvalidArgumentException.php
index a5552652566..199901465db 100644
--- a/library/Zend/Markup/Parser/Exception/InvalidArgumentException.php
+++ b/library/Zend/Markup/Parser/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Markup/Parser/Exception/RuntimeException.php b/library/Zend/Markup/Parser/Exception/RuntimeException.php
index 6f89ebe853c..1ed66c02248 100644
--- a/library/Zend/Markup/Parser/Exception/RuntimeException.php
+++ b/library/Zend/Markup/Parser/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Markup/Parser/ParserInterface.php b/library/Zend/Markup/Parser/ParserInterface.php
index 332d3da98e2..68d0a592822 100644
--- a/library/Zend/Markup/Parser/ParserInterface.php
+++ b/library/Zend/Markup/Parser/ParserInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Parser;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ParserInterface
 {
diff --git a/library/Zend/Markup/Parser/Textile.php b/library/Zend/Markup/Parser/Textile.php
index b56cc232235..5db4ec37f76 100644
--- a/library/Zend/Markup/Parser/Textile.php
+++ b/library/Zend/Markup/Parser/Textile.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Parser;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Textile implements ParserInterface
 {
diff --git a/library/Zend/Markup/ParserPluginManager.php b/library/Zend/Markup/ParserPluginManager.php
index 69ad3084bc1..c2384d8d6d5 100644
--- a/library/Zend/Markup/ParserPluginManager.php
+++ b/library/Zend/Markup/ParserPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ParserPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Markup/Renderer/AbstractRenderer.php b/library/Zend/Markup/Renderer/AbstractRenderer.php
index 9a3337618e5..c9cab989721 100644
--- a/library/Zend/Markup/Renderer/AbstractRenderer.php
+++ b/library/Zend/Markup/Renderer/AbstractRenderer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractRenderer
 {
diff --git a/library/Zend/Markup/Renderer/Exception/ExceptionInterface.php b/library/Zend/Markup/Renderer/Exception/ExceptionInterface.php
index 1ff81ac9796..45654dfdecc 100644
--- a/library/Zend/Markup/Renderer/Exception/ExceptionInterface.php
+++ b/library/Zend/Markup/Renderer/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/Markup/Renderer/Exception/RuntimeException.php b/library/Zend/Markup/Renderer/Exception/RuntimeException.php
index d39f65adc53..6491d458f42 100644
--- a/library/Zend/Markup/Renderer/Exception/RuntimeException.php
+++ b/library/Zend/Markup/Renderer/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Markup/Renderer/Html.php b/library/Zend/Markup/Renderer/Html.php
index 996f43cd2b9..88d31c9dacc 100644
--- a/library/Zend/Markup/Renderer/Html.php
+++ b/library/Zend/Markup/Renderer/Html.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Html extends AbstractRenderer
 {
diff --git a/library/Zend/Markup/Renderer/Markup/AbstractMarkup.php b/library/Zend/Markup/Renderer/Markup/AbstractMarkup.php
index ee7792610b8..d083ef58cd0 100644
--- a/library/Zend/Markup/Renderer/Markup/AbstractMarkup.php
+++ b/library/Zend/Markup/Renderer/Markup/AbstractMarkup.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractMarkup implements Markup\MarkupInterface
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Html/AbstractHtml.php b/library/Zend/Markup/Renderer/Markup/Html/AbstractHtml.php
index b12e1d5c16f..1ef4ca5e5af 100644
--- a/library/Zend/Markup/Renderer/Markup/Html/AbstractHtml.php
+++ b/library/Zend/Markup/Renderer/Markup/Html/AbstractHtml.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_HTML
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup\Html;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractHtml extends AbstractMarkup
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Html/Code.php b/library/Zend/Markup/Renderer/Markup/Html/Code.php
index 68dd0f214b9..33b0003db2a 100644
--- a/library/Zend/Markup/Renderer/Markup/Html/Code.php
+++ b/library/Zend/Markup/Renderer/Markup/Html/Code.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup\Html;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code extends AbstractHtml
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Html/Img.php b/library/Zend/Markup/Renderer/Markup/Html/Img.php
index 56ac7f471d0..630a5e63316 100644
--- a/library/Zend/Markup/Renderer/Markup/Html/Img.php
+++ b/library/Zend/Markup/Renderer/Markup/Html/Img.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup\Html;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Img extends AbstractHtml
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Html/ListItem.php b/library/Zend/Markup/Renderer/Markup/Html/ListItem.php
index ea99e19792f..c785191afc7 100644
--- a/library/Zend/Markup/Renderer/Markup/Html/ListItem.php
+++ b/library/Zend/Markup/Renderer/Markup/Html/ListItem.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup\Html;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ListItem extends AbstractHtml
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Html/Replace.php b/library/Zend/Markup/Renderer/Markup/Html/Replace.php
index 22c41dc7f29..74a17dd610a 100644
--- a/library/Zend/Markup/Renderer/Markup/Html/Replace.php
+++ b/library/Zend/Markup/Renderer/Markup/Html/Replace.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup\Html;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Replace extends AbstractHtml
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Html/Root.php b/library/Zend/Markup/Renderer/Markup/Html/Root.php
index c257128b2bc..1cd5fc1cf7e 100644
--- a/library/Zend/Markup/Renderer/Markup/Html/Root.php
+++ b/library/Zend/Markup/Renderer/Markup/Html/Root.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup\Html;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Root extends AbstractHtml
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Html/Url.php b/library/Zend/Markup/Renderer/Markup/Html/Url.php
index 654d91e8ad9..c5656ca25d6 100644
--- a/library/Zend/Markup/Renderer/Markup/Html/Url.php
+++ b/library/Zend/Markup/Renderer/Markup/Html/Url.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup\Html;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Url extends AbstractHtml
 {
diff --git a/library/Zend/Markup/Renderer/Markup/MarkupInterface.php b/library/Zend/Markup/Renderer/Markup/MarkupInterface.php
index c8a1316c314..ab227597e74 100644
--- a/library/Zend/Markup/Renderer/Markup/MarkupInterface.php
+++ b/library/Zend/Markup/Renderer/Markup/MarkupInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface MarkupInterface extends FilterInterface
 {
diff --git a/library/Zend/Markup/Renderer/Markup/Replace.php b/library/Zend/Markup/Renderer/Markup/Replace.php
index 4dbcaf8142b..40c86200dd3 100644
--- a/library/Zend/Markup/Renderer/Markup/Replace.php
+++ b/library/Zend/Markup/Renderer/Markup/Replace.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup\Renderer\Markup;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Renderer_Markup_Html
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Replace extends AbstractMarkup
 {
diff --git a/library/Zend/Markup/RendererPluginManager.php b/library/Zend/Markup/RendererPluginManager.php
index 7318d84d058..e71a4ee683a 100644
--- a/library/Zend/Markup/RendererPluginManager.php
+++ b/library/Zend/Markup/RendererPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RendererPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Markup/Token.php b/library/Zend/Markup/Token.php
index e2fe88d81b6..bf1c6b85c4c 100644
--- a/library/Zend/Markup/Token.php
+++ b/library/Zend/Markup/Token.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Markup
  * @subpackage Parser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Token
 {
diff --git a/library/Zend/Markup/TokenList.php b/library/Zend/Markup/TokenList.php
index 5b96fb8e724..694d35a39d4 100644
--- a/library/Zend/Markup/TokenList.php
+++ b/library/Zend/Markup/TokenList.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Markup;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TokenList implements \RecursiveIterator
 {
diff --git a/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php b/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
index 5f438f5bba0..4c3ace1525b 100644
--- a/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
+++ b/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
diff --git a/library/Zend/Math/BigInteger/Adapter/Bcmath.php b/library/Zend/Math/BigInteger/Adapter/Bcmath.php
index 30c21ebb9c6..b876c1165d2 100644
--- a/library/Zend/Math/BigInteger/Adapter/Bcmath.php
+++ b/library/Zend/Math/BigInteger/Adapter/Bcmath.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
@@ -340,4 +338,4 @@ public function baseConvert($operand, $fromBase, $toBase = 10)
 
         return $sign . $result;
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Math/BigInteger/Adapter/Gmp.php b/library/Zend/Math/BigInteger/Adapter/Gmp.php
index 200352c1a2c..67074251351 100644
--- a/library/Zend/Math/BigInteger/Adapter/Gmp.php
+++ b/library/Zend/Math/BigInteger/Adapter/Gmp.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
@@ -316,4 +314,4 @@ public function baseConvert($operand, $fromBase, $toBase = 10)
 
         return $sign . $result;
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Math/BigInteger/AdapterPluginManager.php b/library/Zend/Math/BigInteger/AdapterPluginManager.php
index d4f27117702..135033c7cd8 100644
--- a/library/Zend/Math/BigInteger/AdapterPluginManager.php
+++ b/library/Zend/Math/BigInteger/AdapterPluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Math
  * @subpackage BigInteger
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Math\BigInteger;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Math
  * @subpackage BigInteger
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AdapterPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Math/BigInteger/BigInteger.php b/library/Zend/Math/BigInteger/BigInteger.php
index ff7ab4cdd2b..aa27a27a73f 100644
--- a/library/Zend/Math/BigInteger/BigInteger.php
+++ b/library/Zend/Math/BigInteger/BigInteger.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
diff --git a/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php b/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
index 41e4b34200c..b053a74d4a2 100644
--- a/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
+++ b/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
@@ -18,4 +16,4 @@
  * @subpackage BigInteger
  */
 class DivisionByZeroException extends RuntimeException implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php b/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
index 2fd1186ed11..ae28eeeef01 100644
--- a/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
+++ b/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
@@ -20,4 +18,4 @@
  * @subpackage BigInteger
  */
 interface ExceptionInterface extends Exception\ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php b/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
index 10668d1d94e..bdb5ad3b2bc 100644
--- a/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
+++ b/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
@@ -20,4 +18,4 @@
  * @subpackage BigInteger
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Math/BigInteger/Exception/RuntimeException.php b/library/Zend/Math/BigInteger/Exception/RuntimeException.php
index bcf88e96c3a..9dc7783e1fd 100644
--- a/library/Zend/Math/BigInteger/Exception/RuntimeException.php
+++ b/library/Zend/Math/BigInteger/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Math
  */
 
@@ -20,4 +18,4 @@
  * @subpackage BigInteger
  */
 class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Math/Exception/ExceptionInterface.php b/library/Zend/Math/Exception/ExceptionInterface.php
index 5ab6d47254a..dc11faac78f 100644
--- a/library/Zend/Math/Exception/ExceptionInterface.php
+++ b/library/Zend/Math/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Math
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Math\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Math
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Math/Exception/InvalidArgumentException.php b/library/Zend/Math/Exception/InvalidArgumentException.php
index 57bd6b633b1..ed68db5f732 100644
--- a/library/Zend/Math/Exception/InvalidArgumentException.php
+++ b/library/Zend/Math/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Math
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Math\Exception;
@@ -27,11 +25,9 @@
  * @category   Zend
  * @package    Zend_Math
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Math/Exception/RuntimeException.php b/library/Zend/Math/Exception/RuntimeException.php
index 7c9c594cf8c..af441265040 100644
--- a/library/Zend/Math/Exception/RuntimeException.php
+++ b/library/Zend/Math/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Math
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Math\Exception;
@@ -27,11 +25,9 @@
  * @category   Zend
  * @package    Zend_Math
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Math/Math.php b/library/Zend/Math/Math.php
index 4192a6dd180..0f4e8426130 100644
--- a/library/Zend/Math/Math.php
+++ b/library/Zend/Math/Math.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Math
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Math;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Math
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Math
 {
diff --git a/library/Zend/Memory/Container/AbstractContainer.php b/library/Zend/Memory/Container/AbstractContainer.php
index fc94443e361..4dec8f13bea 100644
--- a/library/Zend/Memory/Container/AbstractContainer.php
+++ b/library/Zend/Memory/Container/AbstractContainer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Container;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractContainer implements ContainerInterface
 {
diff --git a/library/Zend/Memory/Container/AccessController.php b/library/Zend/Memory/Container/AccessController.php
index 51ba666ffc6..3f5172f5a01 100644
--- a/library/Zend/Memory/Container/AccessController.php
+++ b/library/Zend/Memory/Container/AccessController.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Container;
@@ -34,8 +32,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AccessController implements ContainerInterface
 {
diff --git a/library/Zend/Memory/Container/ContainerInterface.php b/library/Zend/Memory/Container/ContainerInterface.php
index 9b0cf94a181..573a245ba59 100644
--- a/library/Zend/Memory/Container/ContainerInterface.php
+++ b/library/Zend/Memory/Container/ContainerInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Container;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ContainerInterface
 {
diff --git a/library/Zend/Memory/Container/Locked.php b/library/Zend/Memory/Container/Locked.php
index 3fcadf2542c..d8e1859b80a 100644
--- a/library/Zend/Memory/Container/Locked.php
+++ b/library/Zend/Memory/Container/Locked.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Container;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Locked extends AbstractContainer
 {
diff --git a/library/Zend/Memory/Container/Movable.php b/library/Zend/Memory/Container/Movable.php
index 69b562fbd7c..81262a642bd 100644
--- a/library/Zend/Memory/Container/Movable.php
+++ b/library/Zend/Memory/Container/Movable.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Container;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Movable extends AbstractContainer
 {
diff --git a/library/Zend/Memory/Exception/ExceptionInterface.php b/library/Zend/Memory/Exception/ExceptionInterface.php
index ee2254f3927..cd4c0f20a75 100644
--- a/library/Zend/Memory/Exception/ExceptionInterface.php
+++ b/library/Zend/Memory/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Memory/Exception/InvalidArgumentException.php b/library/Zend/Memory/Exception/InvalidArgumentException.php
index bfd8c11ab15..ec0f6422b58 100644
--- a/library/Zend/Memory/Exception/InvalidArgumentException.php
+++ b/library/Zend/Memory/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Memory/Exception/RuntimeException.php b/library/Zend/Memory/Exception/RuntimeException.php
index 64c772c2628..e5a17140bc7 100644
--- a/library/Zend/Memory/Exception/RuntimeException.php
+++ b/library/Zend/Memory/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Memory/MemoryManager.php b/library/Zend/Memory/MemoryManager.php
index bb48d194169..ac4bb7c00f3 100644
--- a/library/Zend/Memory/MemoryManager.php
+++ b/library/Zend/Memory/MemoryManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory;
@@ -34,8 +32,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MemoryManager
 {
diff --git a/library/Zend/Memory/Value.php b/library/Zend/Memory/Value.php
index 89815e2fa81..5ababb07c01 100644
--- a/library/Zend/Memory/Value.php
+++ b/library/Zend/Memory/Value.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Memory;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Value implements ArrayAccess, Countable
 {
diff --git a/library/Zend/Mime/Decode.php b/library/Zend/Mime/Decode.php
index 2fa51870ebf..c03bf1bbb96 100644
--- a/library/Zend/Mime/Decode.php
+++ b/library/Zend/Mime/Decode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mime;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Decode
 {
diff --git a/library/Zend/Mime/Exception/ExceptionInterface.php b/library/Zend/Mime/Exception/ExceptionInterface.php
index c3c119cc0d6..5e6be061ce8 100644
--- a/library/Zend/Mime/Exception/ExceptionInterface.php
+++ b/library/Zend/Mime/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mime\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Mime/Exception/RuntimeException.php b/library/Zend/Mime/Exception/RuntimeException.php
index 32a42b634ed..3dd7c3bd41d 100644
--- a/library/Zend/Mime/Exception/RuntimeException.php
+++ b/library/Zend/Mime/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mime\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Mime/Message.php b/library/Zend/Mime/Message.php
index e9e59ab07fa..6e334ce6a5b 100644
--- a/library/Zend/Mime/Message.php
+++ b/library/Zend/Mime/Message.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mime;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Message
 {
diff --git a/library/Zend/Mime/Mime.php b/library/Zend/Mime/Mime.php
index 4c182ec49ea..f42d4330095 100644
--- a/library/Zend/Mime/Mime.php
+++ b/library/Zend/Mime/Mime.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mime;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mime
 {
diff --git a/library/Zend/Mime/Part.php b/library/Zend/Mime/Part.php
index 724bc4adb2d..46ed2d4fb75 100644
--- a/library/Zend/Mime/Part.php
+++ b/library/Zend/Mime/Part.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mime;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Part {
 
diff --git a/library/Zend/ModuleManager/Exception/ExceptionInterface.php b/library/Zend/ModuleManager/Exception/ExceptionInterface.php
index 202ea310e06..30e2877b720 100644
--- a/library/Zend/ModuleManager/Exception/ExceptionInterface.php
+++ b/library/Zend/ModuleManager/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Exception/InvalidArgumentException.php b/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
index 64f0cff323e..c22a12fa30f 100644
--- a/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
+++ b/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Exception/RuntimeException.php b/library/Zend/ModuleManager/Exception/RuntimeException.php
index 1bef7b86f56..b3db3d216d7 100644
--- a/library/Zend/ModuleManager/Exception/RuntimeException.php
+++ b/library/Zend/ModuleManager/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php b/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
index dcea8045a3b..384c71a41c4 100644
--- a/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php b/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
index 43d8ea9901b..4cbd54692f7 100644
--- a/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
+++ b/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php b/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
index d36b4caf62e..802f133d8aa 100644
--- a/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ModuleManager\Feature;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ConfigProviderInterface
 {
diff --git a/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php b/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
index 19da8f65305..f1f793179cb 100644
--- a/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ModuleManager\Feature;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ControllerPluginProviderInterface
 {
diff --git a/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php b/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
index 575801e2446..62b51f1eef2 100644
--- a/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ModuleManager\Feature;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ControllerProviderInterface
 {
diff --git a/library/Zend/ModuleManager/Feature/InitProviderInterface.php b/library/Zend/ModuleManager/Feature/InitProviderInterface.php
index 3cd77a1a76f..53d7c2bdcf9 100644
--- a/library/Zend/ModuleManager/Feature/InitProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/InitProviderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ModuleManager\Feature;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InitProviderInterface
 {
diff --git a/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php b/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
index 00e7550758b..eda110f9394 100644
--- a/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
+++ b/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php b/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
index 5b3259239bd..ed3c8294eba 100644
--- a/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ModuleManager\Feature;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ServiceProviderInterface
 {
diff --git a/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php b/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
index 6385237ca3c..83c677af909 100644
--- a/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ModuleManager\Feature;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ViewHelperProviderInterface
 {
diff --git a/library/Zend/ModuleManager/Listener/AbstractListener.php b/library/Zend/ModuleManager/Listener/AbstractListener.php
index 45553f08564..ca9ac7f9af9 100644
--- a/library/Zend/ModuleManager/Listener/AbstractListener.php
+++ b/library/Zend/ModuleManager/Listener/AbstractListener.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/AutoloaderListener.php b/library/Zend/ModuleManager/Listener/AutoloaderListener.php
index 67fad15acc3..5c838aae3d2 100644
--- a/library/Zend/ModuleManager/Listener/AutoloaderListener.php
+++ b/library/Zend/ModuleManager/Listener/AutoloaderListener.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/ConfigListener.php b/library/Zend/ModuleManager/Listener/ConfigListener.php
index e18785e09b2..dd9d3cb3166 100644
--- a/library/Zend/ModuleManager/Listener/ConfigListener.php
+++ b/library/Zend/ModuleManager/Listener/ConfigListener.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 namespace Zend\ModuleManager\Listener;
diff --git a/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php b/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
index ec14619578d..26b5c6c7422 100644
--- a/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
+++ b/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php b/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
index 0404c3e34d3..478a6d322d1 100644
--- a/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
+++ b/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php b/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
index 326ef78b037..0755b0220b6 100644
--- a/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
+++ b/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php b/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
index d3234de575e..3c5c8425174 100644
--- a/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
+++ b/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php b/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
index bbc932ea6a2..222c4601ee0 100644
--- a/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
+++ b/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/InitTrigger.php b/library/Zend/ModuleManager/Listener/InitTrigger.php
index 75f7ec930e3..274162cc3ac 100644
--- a/library/Zend/ModuleManager/Listener/InitTrigger.php
+++ b/library/Zend/ModuleManager/Listener/InitTrigger.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/ListenerOptions.php b/library/Zend/ModuleManager/Listener/ListenerOptions.php
index 761fbb8bd41..3858f691341 100644
--- a/library/Zend/ModuleManager/Listener/ListenerOptions.php
+++ b/library/Zend/ModuleManager/Listener/ListenerOptions.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php b/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
index e57337c28f3..d0656517912 100644
--- a/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
+++ b/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/ModuleResolverListener.php b/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
index 5093f30cacf..a0cc0cabc93 100644
--- a/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
+++ b/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/OnBootstrapListener.php b/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
index 48e7dd88ce2..b6d1c262e7d 100644
--- a/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
+++ b/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/Listener/ServiceListener.php b/library/Zend/ModuleManager/Listener/ServiceListener.php
index 6edaac55afd..49b4b8ea024 100644
--- a/library/Zend/ModuleManager/Listener/ServiceListener.php
+++ b/library/Zend/ModuleManager/Listener/ServiceListener.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ModuleManager\Listener;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServiceListener implements ListenerAggregateInterface
 {
diff --git a/library/Zend/ModuleManager/ModuleEvent.php b/library/Zend/ModuleManager/ModuleEvent.php
index b4eceec3808..59ed4412284 100644
--- a/library/Zend/ModuleManager/ModuleEvent.php
+++ b/library/Zend/ModuleManager/ModuleEvent.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/ModuleManager.php b/library/Zend/ModuleManager/ModuleManager.php
index df208765b5b..77c573798e0 100644
--- a/library/Zend/ModuleManager/ModuleManager.php
+++ b/library/Zend/ModuleManager/ModuleManager.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_ModuleManager
  */
 
diff --git a/library/Zend/ModuleManager/ModuleManagerInterface.php b/library/Zend/ModuleManager/ModuleManagerInterface.php
index a041d342e61..dc4a6599306 100644
--- a/library/Zend/ModuleManager/ModuleManagerInterface.php
+++ b/library/Zend/ModuleManager/ModuleManagerInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Module
  */
 
diff --git a/library/Zend/Mvc/Application.php b/library/Zend/Mvc/Application.php
index bfaa7964b03..7be9c0b7fa9 100644
--- a/library/Zend/Mvc/Application.php
+++ b/library/Zend/Mvc/Application.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc;
@@ -58,8 +56,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Application implements
     ApplicationInterface,
diff --git a/library/Zend/Mvc/ApplicationInterface.php b/library/Zend/Mvc/ApplicationInterface.php
index 0bb43bc984f..528d79cd062 100644
--- a/library/Zend/Mvc/ApplicationInterface.php
+++ b/library/Zend/Mvc/ApplicationInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ApplicationInterface extends EventsCapableInterface
 {
diff --git a/library/Zend/Mvc/Controller/AbstractActionController.php b/library/Zend/Mvc/Controller/AbstractActionController.php
index 05cb6642aab..43b7033e172 100644
--- a/library/Zend/Mvc/Controller/AbstractActionController.php
+++ b/library/Zend/Mvc/Controller/AbstractActionController.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller;
@@ -42,8 +40,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractActionController implements
     Dispatchable, 
diff --git a/library/Zend/Mvc/Controller/AbstractRestfulController.php b/library/Zend/Mvc/Controller/AbstractRestfulController.php
index a41582eaaaa..25b9a67d2e7 100644
--- a/library/Zend/Mvc/Controller/AbstractRestfulController.php
+++ b/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller;
@@ -42,8 +40,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractRestfulController implements
     Dispatchable,
diff --git a/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php b/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
index 73f0c0ea409..3fcd96070fe 100644
--- a/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
+++ b/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPlugin implements PluginInterface
 {
diff --git a/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php b/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
index d7ddd888739..e33764801ba 100644
--- a/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
+++ b/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller\Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller\Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Countable
 {
diff --git a/library/Zend/Mvc/Controller/Plugin/Forward.php b/library/Zend/Mvc/Controller/Plugin/Forward.php
index b831d04c15c..ed91bb00f7e 100644
--- a/library/Zend/Mvc/Controller/Plugin/Forward.php
+++ b/library/Zend/Mvc/Controller/Plugin/Forward.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Forward extends AbstractPlugin
 {
diff --git a/library/Zend/Mvc/Controller/Plugin/Layout.php b/library/Zend/Mvc/Controller/Plugin/Layout.php
index a74a9fcc897..1aa978f0af5 100644
--- a/library/Zend/Mvc/Controller/Plugin/Layout.php
+++ b/library/Zend/Mvc/Controller/Plugin/Layout.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Layout extends AbstractPlugin
 {
diff --git a/library/Zend/Mvc/Controller/Plugin/Params.php b/library/Zend/Mvc/Controller/Plugin/Params.php
index 505d33f6120..47e3699daf0 100644
--- a/library/Zend/Mvc/Controller/Plugin/Params.php
+++ b/library/Zend/Mvc/Controller/Plugin/Params.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Params extends AbstractPlugin
 {
@@ -93,4 +89,4 @@ public function fromQuery($param, $default = null)
     {
         return $this->getController()->getRequest()->getQuery()->get($param, $default);
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Mvc/Controller/Plugin/PluginInterface.php b/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
index a87f878bd29..403c9b500b3 100644
--- a/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
+++ b/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface PluginInterface
 {
diff --git a/library/Zend/Mvc/Controller/Plugin/Redirect.php b/library/Zend/Mvc/Controller/Plugin/Redirect.php
index f31b5d4c8a0..e7a9bce4c9b 100644
--- a/library/Zend/Mvc/Controller/Plugin/Redirect.php
+++ b/library/Zend/Mvc/Controller/Plugin/Redirect.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Redirect extends AbstractPlugin
 {
diff --git a/library/Zend/Mvc/Controller/Plugin/Url.php b/library/Zend/Mvc/Controller/Plugin/Url.php
index e5e86428b61..aecb86e79c3 100644
--- a/library/Zend/Mvc/Controller/Plugin/Url.php
+++ b/library/Zend/Mvc/Controller/Plugin/Url.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller\Plugin;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Url extends AbstractPlugin
 {
diff --git a/library/Zend/Mvc/Controller/PluginManager.php b/library/Zend/Mvc/Controller/PluginManager.php
index 651f3a24055..5a8e6480fd9 100644
--- a/library/Zend/Mvc/Controller/PluginManager.php
+++ b/library/Zend/Mvc/Controller/PluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Controller;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Controller
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Mvc/DispatchListener.php b/library/Zend/Mvc/DispatchListener.php
index 6bd163d4911..c60dff0ea2a 100644
--- a/library/Zend/Mvc/DispatchListener.php
+++ b/library/Zend/Mvc/DispatchListener.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc;
@@ -48,8 +46,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DispatchListener implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Mvc/Exception/DomainException.php b/library/Zend/Mvc/Exception/DomainException.php
index 0a99b8fd668..6bb3f6a6e0a 100644
--- a/library/Zend/Mvc/Exception/DomainException.php
+++ b/library/Zend/Mvc/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {
diff --git a/library/Zend/Mvc/Exception/ExceptionInterface.php b/library/Zend/Mvc/Exception/ExceptionInterface.php
index e30b9fc9177..408d7f86ed9 100644
--- a/library/Zend/Mvc/Exception/ExceptionInterface.php
+++ b/library/Zend/Mvc/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Mvc/Exception/InvalidArgumentException.php b/library/Zend/Mvc/Exception/InvalidArgumentException.php
index aab025bcc38..ec16aba9369 100644
--- a/library/Zend/Mvc/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mvc/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Mvc/Exception/InvalidPluginException.php b/library/Zend/Mvc/Exception/InvalidPluginException.php
index 7c6a076d3be..af5e6b0f6d9 100644
--- a/library/Zend/Mvc/Exception/InvalidPluginException.php
+++ b/library/Zend/Mvc/Exception/InvalidPluginException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidPluginException extends \Exception implements ExceptionInterface
 {
diff --git a/library/Zend/Mvc/Exception/MissingLocatorException.php b/library/Zend/Mvc/Exception/MissingLocatorException.php
index 857f2a6996d..8ba93f208d6 100644
--- a/library/Zend/Mvc/Exception/MissingLocatorException.php
+++ b/library/Zend/Mvc/Exception/MissingLocatorException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MissingLocatorException extends RuntimeException
 {
diff --git a/library/Zend/Mvc/Exception/RuntimeException.php b/library/Zend/Mvc/Exception/RuntimeException.php
index 5dd35d9b23a..1499b1e9103 100644
--- a/library/Zend/Mvc/Exception/RuntimeException.php
+++ b/library/Zend/Mvc/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Mvc/InjectApplicationEventInterface.php b/library/Zend/Mvc/InjectApplicationEventInterface.php
index c33de6e7181..6b4c50f854f 100644
--- a/library/Zend/Mvc/InjectApplicationEventInterface.php
+++ b/library/Zend/Mvc/InjectApplicationEventInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InjectApplicationEventInterface
 {
diff --git a/library/Zend/Mvc/ModuleRouteListener.php b/library/Zend/Mvc/ModuleRouteListener.php
index da113a96b6a..0c0ac875440 100644
--- a/library/Zend/Mvc/ModuleRouteListener.php
+++ b/library/Zend/Mvc/ModuleRouteListener.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ModuleRouteListener implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Mvc/MvcEvent.php b/library/Zend/Mvc/MvcEvent.php
index 3487d181603..dbf88b45808 100644
--- a/library/Zend/Mvc/MvcEvent.php
+++ b/library/Zend/Mvc/MvcEvent.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MvcEvent extends Event
 {
diff --git a/library/Zend/Mvc/RouteListener.php b/library/Zend/Mvc/RouteListener.php
index 65898be50f9..50f39217191 100644
--- a/library/Zend/Mvc/RouteListener.php
+++ b/library/Zend/Mvc/RouteListener.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Mvc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RouteListener implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Mvc/Router/Exception/ExceptionInterface.php b/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
index cf24c599f00..c6b5fe9fdbb 100644
--- a/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
+++ b/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Exception;
@@ -24,8 +22,6 @@
 
 /**
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php b/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
index a2aeba02bc4..7dcbff5a80d 100644
--- a/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Mvc_Router
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Mvc/Router/Exception/RuntimeException.php b/library/Zend/Mvc/Router/Exception/RuntimeException.php
index 06c44e407f3..db678cc7ca3 100644
--- a/library/Zend/Mvc/Router/Exception/RuntimeException.php
+++ b/library/Zend/Mvc/Router/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Exception;
@@ -26,8 +24,6 @@
 /**
  * @package    Zend_Mvc_Router
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Mvc/Router/Http/Hostname.php b/library/Zend/Mvc/Router/Http/Hostname.php
index 069ecb4c106..4a0d6841b88 100644
--- a/library/Zend/Mvc/Router/Http/Hostname.php
+++ b/library/Zend/Mvc/Router/Http/Hostname.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Hostname implements RouteInterface
diff --git a/library/Zend/Mvc/Router/Http/Literal.php b/library/Zend/Mvc/Router/Http/Literal.php
index ae85ec1cc27..497f6388f7e 100644
--- a/library/Zend/Mvc/Router/Http/Literal.php
+++ b/library/Zend/Mvc/Router/Http/Literal.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Literal implements RouteInterface
diff --git a/library/Zend/Mvc/Router/Http/Method.php b/library/Zend/Mvc/Router/Http/Method.php
index 4ec568cb6a0..b5e206b7750 100644
--- a/library/Zend/Mvc/Router/Http/Method.php
+++ b/library/Zend/Mvc/Router/Http/Method.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Method implements RouteInterface
 {
diff --git a/library/Zend/Mvc/Router/Http/Part.php b/library/Zend/Mvc/Router/Http/Part.php
index 45f928c9c34..5f532eb8015 100644
--- a/library/Zend/Mvc/Router/Http/Part.php
+++ b/library/Zend/Mvc/Router/Http/Part.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -33,8 +31,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Part extends TreeRouteStack implements RouteInterface
diff --git a/library/Zend/Mvc/Router/Http/Query.php b/library/Zend/Mvc/Router/Http/Query.php
index de5607c5f58..5f56e21e954 100644
--- a/library/Zend/Mvc/Router/Http/Query.php
+++ b/library/Zend/Mvc/Router/Http/Query.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -33,8 +31,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Query implements RouteInterface
diff --git a/library/Zend/Mvc/Router/Http/Regex.php b/library/Zend/Mvc/Router/Http/Regex.php
index 7180b1e536f..75157a0a30e 100644
--- a/library/Zend/Mvc/Router/Http/Regex.php
+++ b/library/Zend/Mvc/Router/Http/Regex.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Regex implements RouteInterface
diff --git a/library/Zend/Mvc/Router/Http/RouteInterface.php b/library/Zend/Mvc/Router/Http/RouteInterface.php
index 36890c1c989..a5141081cce 100644
--- a/library/Zend/Mvc/Router/Http/RouteInterface.php
+++ b/library/Zend/Mvc/Router/Http/RouteInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -26,8 +24,6 @@
  * Tree specific route interface.
  * 
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RouteInterface extends BaseRoute
 {
diff --git a/library/Zend/Mvc/Router/Http/RouteMatch.php b/library/Zend/Mvc/Router/Http/RouteMatch.php
index 346cc940f0c..c0c3aaed793 100644
--- a/library/Zend/Mvc/Router/Http/RouteMatch.php
+++ b/library/Zend/Mvc/Router/Http/RouteMatch.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RouteMatch extends BaseRouteMatch
 {
diff --git a/library/Zend/Mvc/Router/Http/Scheme.php b/library/Zend/Mvc/Router/Http/Scheme.php
index 55adac32fc3..c2d78c043e6 100644
--- a/library/Zend/Mvc/Router/Http/Scheme.php
+++ b/library/Zend/Mvc/Router/Http/Scheme.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Scheme implements RouteInterface
diff --git a/library/Zend/Mvc/Router/Http/Segment.php b/library/Zend/Mvc/Router/Http/Segment.php
index 8538994b30c..a45903dfb44 100644
--- a/library/Zend/Mvc/Router/Http/Segment.php
+++ b/library/Zend/Mvc/Router/Http/Segment.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Segment implements RouteInterface
diff --git a/library/Zend/Mvc/Router/Http/TreeRouteStack.php b/library/Zend/Mvc/Router/Http/TreeRouteStack.php
index 3e3eada95b6..c29eebc65ab 100644
--- a/library/Zend/Mvc/Router/Http/TreeRouteStack.php
+++ b/library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TreeRouteStack extends SimpleRouteStack
 {
diff --git a/library/Zend/Mvc/Router/Http/Wildcard.php b/library/Zend/Mvc/Router/Http/Wildcard.php
index 8b453deeee3..2763a1c78a1 100644
--- a/library/Zend/Mvc/Router/Http/Wildcard.php
+++ b/library/Zend/Mvc/Router/Http/Wildcard.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router\Http;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_Mvc_Router
  * @subpackage Http
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://manuals.rubyonrails.com/read/chapter/65
  */
 class Wildcard implements RouteInterface
diff --git a/library/Zend/Mvc/Router/PriorityList.php b/library/Zend/Mvc/Router/PriorityList.php
index 755b53350f3..651904a887e 100644
--- a/library/Zend/Mvc/Router/PriorityList.php
+++ b/library/Zend/Mvc/Router/PriorityList.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router;
@@ -28,8 +26,6 @@
  * Priority list
  *
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class PriorityList implements Iterator, Countable
 {
diff --git a/library/Zend/Mvc/Router/RouteInterface.php b/library/Zend/Mvc/Router/RouteInterface.php
index aed007035d8..f3a52c43f55 100644
--- a/library/Zend/Mvc/Router/RouteInterface.php
+++ b/library/Zend/Mvc/Router/RouteInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router;
@@ -26,8 +24,6 @@
  * RouteInterface interface.
  *
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RouteInterface
 {
diff --git a/library/Zend/Mvc/Router/RouteMatch.php b/library/Zend/Mvc/Router/RouteMatch.php
index 1d2ccca5d02..8c1f3145494 100644
--- a/library/Zend/Mvc/Router/RouteMatch.php
+++ b/library/Zend/Mvc/Router/RouteMatch.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router;
@@ -24,8 +22,6 @@
  * RouteInterface match.
  *
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RouteMatch
 {
diff --git a/library/Zend/Mvc/Router/RoutePluginManager.php b/library/Zend/Mvc/Router/RoutePluginManager.php
index 7ddf691cf14..095916239be 100644
--- a/library/Zend/Mvc/Router/RoutePluginManager.php
+++ b/library/Zend/Mvc/Router/RoutePluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RoutePluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Mvc/Router/RouteStackInterface.php b/library/Zend/Mvc/Router/RouteStackInterface.php
index 87ece9c2147..07793efcdfc 100644
--- a/library/Zend/Mvc/Router/RouteStackInterface.php
+++ b/library/Zend/Mvc/Router/RouteStackInterface.php
@@ -14,16 +14,12 @@
  *
  * @category   Zend
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router;
 
 /**
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RouteStackInterface extends RouteInterface
 {
diff --git a/library/Zend/Mvc/Router/SimpleRouteStack.php b/library/Zend/Mvc/Router/SimpleRouteStack.php
index b4e5ac32281..e3fdde78632 100644
--- a/library/Zend/Mvc/Router/SimpleRouteStack.php
+++ b/library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Router;
@@ -30,8 +28,6 @@
  * Simple route stack implementation.
  *
  * @package    Zend_Mvc_Router
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleRouteStack implements RouteStackInterface
 {
diff --git a/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php b/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
index 7babff58272..4e6247e43ee 100644
--- a/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPluginManagerFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ApplicationFactory.php b/library/Zend/Mvc/Service/ApplicationFactory.php
index b5f9f072e0f..8eeae383c6d 100644
--- a/library/Zend/Mvc/Service/ApplicationFactory.php
+++ b/library/Zend/Mvc/Service/ApplicationFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ApplicationFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ConfigurationFactory.php b/library/Zend/Mvc/Service/ConfigurationFactory.php
index 79fb14cf7f5..313e0da7e6c 100644
--- a/library/Zend/Mvc/Service/ConfigurationFactory.php
+++ b/library/Zend/Mvc/Service/ConfigurationFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ConfigurationFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ControllerLoaderFactory.php b/library/Zend/Mvc/Service/ControllerLoaderFactory.php
index 1338bc29247..180b3bd7367 100644
--- a/library/Zend/Mvc/Service/ControllerLoaderFactory.php
+++ b/library/Zend/Mvc/Service/ControllerLoaderFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ControllerLoaderFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php b/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
index b1852629e1d..0dd64af2181 100644
--- a/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ControllerPluginManagerFactory extends AbstractPluginManagerFactory
 {
diff --git a/library/Zend/Mvc/Service/DiFactory.php b/library/Zend/Mvc/Service/DiFactory.php
index 8547a253fbf..960b04f0229 100644
--- a/library/Zend/Mvc/Service/DiFactory.php
+++ b/library/Zend/Mvc/Service/DiFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DiFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/EventManagerFactory.php b/library/Zend/Mvc/Service/EventManagerFactory.php
index 4939f62a036..d4f069eeb77 100644
--- a/library/Zend/Mvc/Service/EventManagerFactory.php
+++ b/library/Zend/Mvc/Service/EventManagerFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EventManagerFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ModuleManagerFactory.php b/library/Zend/Mvc/Service/ModuleManagerFactory.php
index 0f073b615c9..f0bc131d16f 100644
--- a/library/Zend/Mvc/Service/ModuleManagerFactory.php
+++ b/library/Zend/Mvc/Service/ModuleManagerFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ModuleManagerFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/RouterFactory.php b/library/Zend/Mvc/Service/RouterFactory.php
index 2a87c019166..e04b355f058 100644
--- a/library/Zend/Mvc/Service/RouterFactory.php
+++ b/library/Zend/Mvc/Service/RouterFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RouterFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ServiceManagerConfiguration.php b/library/Zend/Mvc/Service/ServiceManagerConfiguration.php
index 83c11d2e2b2..317011a027d 100644
--- a/library/Zend/Mvc/Service/ServiceManagerConfiguration.php
+++ b/library/Zend/Mvc/Service/ServiceManagerConfiguration.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServiceManagerConfiguration implements ConfigurationInterface
 {
diff --git a/library/Zend/Mvc/Service/ViewFeedRendererFactory.php b/library/Zend/Mvc/Service/ViewFeedRendererFactory.php
index 65a5186cbbc..8adfb356f66 100644
--- a/library/Zend/Mvc/Service/ViewFeedRendererFactory.php
+++ b/library/Zend/Mvc/Service/ViewFeedRendererFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewFeedRendererFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php b/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
index 81d6711e65f..1f5309673f0 100644
--- a/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
+++ b/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewFeedStrategyFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ViewHelperManagerFactory.php b/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
index 8e42bfcb307..da3bd1d96dd 100644
--- a/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
+++ b/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewHelperManagerFactory extends AbstractPluginManagerFactory
 {
diff --git a/library/Zend/Mvc/Service/ViewJsonRendererFactory.php b/library/Zend/Mvc/Service/ViewJsonRendererFactory.php
index e0aa7a5e382..0952670ba94 100644
--- a/library/Zend/Mvc/Service/ViewJsonRendererFactory.php
+++ b/library/Zend/Mvc/Service/ViewJsonRendererFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewJsonRendererFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php b/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
index 585e6bf7584..39e90074c79 100644
--- a/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
+++ b/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\Service;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewJsonStrategyFactory implements FactoryInterface
 {
diff --git a/library/Zend/Mvc/View/CreateViewModelListener.php b/library/Zend/Mvc/View/CreateViewModelListener.php
index 77d9c6e4c9d..1c41420d7c5 100644
--- a/library/Zend/Mvc/View/CreateViewModelListener.php
+++ b/library/Zend/Mvc/View/CreateViewModelListener.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\View;
diff --git a/library/Zend/Mvc/View/DefaultRenderingStrategy.php b/library/Zend/Mvc/View/DefaultRenderingStrategy.php
index 6f0dcb7a21c..cebcc3d2afa 100644
--- a/library/Zend/Mvc/View/DefaultRenderingStrategy.php
+++ b/library/Zend/Mvc/View/DefaultRenderingStrategy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\View;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultRenderingStrategy implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Mvc/View/ExceptionStrategy.php b/library/Zend/Mvc/View/ExceptionStrategy.php
index 3d986fce408..016d9ebed4f 100644
--- a/library/Zend/Mvc/View/ExceptionStrategy.php
+++ b/library/Zend/Mvc/View/ExceptionStrategy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\View;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExceptionStrategy implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Mvc/View/InjectTemplateListener.php b/library/Zend/Mvc/View/InjectTemplateListener.php
index b8f57cd48ea..23816fd0d1e 100644
--- a/library/Zend/Mvc/View/InjectTemplateListener.php
+++ b/library/Zend/Mvc/View/InjectTemplateListener.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\View;
diff --git a/library/Zend/Mvc/View/InjectViewModelListener.php b/library/Zend/Mvc/View/InjectViewModelListener.php
index ef088c713a4..6d336984425 100644
--- a/library/Zend/Mvc/View/InjectViewModelListener.php
+++ b/library/Zend/Mvc/View/InjectViewModelListener.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\View;
diff --git a/library/Zend/Mvc/View/RouteNotFoundStrategy.php b/library/Zend/Mvc/View/RouteNotFoundStrategy.php
index 06923dc9947..e3c86c3daa4 100644
--- a/library/Zend/Mvc/View/RouteNotFoundStrategy.php
+++ b/library/Zend/Mvc/View/RouteNotFoundStrategy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\View;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RouteNotFoundStrategy implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Mvc/View/ViewManager.php b/library/Zend/Mvc/View/ViewManager.php
index 87e0d4b6c43..b3a25721872 100644
--- a/library/Zend/Mvc/View/ViewManager.php
+++ b/library/Zend/Mvc/View/ViewManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Mvc\View;
@@ -64,8 +62,6 @@
  * @category   Zend
  * @package    Zend_Mvc
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewManager implements ListenerAggregateInterface
 {
diff --git a/library/Zend/Navigation/AbstractContainer.php b/library/Zend/Navigation/AbstractContainer.php
index 8eee228ac1d..f760b40b552 100644
--- a/library/Zend/Navigation/AbstractContainer.php
+++ b/library/Zend/Navigation/AbstractContainer.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation;
@@ -33,8 +31,6 @@
  *
  * @category  Zend
  * @package   Zend_Navigation
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractContainer implements RecursiveIterator, Countable
 {
diff --git a/library/Zend/Navigation/Exception/BadMethodCallException.php b/library/Zend/Navigation/Exception/BadMethodCallException.php
index 32411765c68..5e128588703 100644
--- a/library/Zend/Navigation/Exception/BadMethodCallException.php
+++ b/library/Zend/Navigation/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException
     extends \BadMethodCallException
diff --git a/library/Zend/Navigation/Exception/DomainException.php b/library/Zend/Navigation/Exception/DomainException.php
index 214cb36571f..322bcd231e9 100644
--- a/library/Zend/Navigation/Exception/DomainException.php
+++ b/library/Zend/Navigation/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException
     extends \DomainException
diff --git a/library/Zend/Navigation/Exception/ExceptionInterface.php b/library/Zend/Navigation/Exception/ExceptionInterface.php
index 91e1d8073d9..b437898b31d 100644
--- a/library/Zend/Navigation/Exception/ExceptionInterface.php
+++ b/library/Zend/Navigation/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Navigation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace Zend\Navigation\Exception;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Navigation
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Navigation/Exception/InvalidArgumentException.php b/library/Zend/Navigation/Exception/InvalidArgumentException.php
index 241dee720a4..3d7870fcc4e 100644
--- a/library/Zend/Navigation/Exception/InvalidArgumentException.php
+++ b/library/Zend/Navigation/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Navigation/Exception/OutOfBoundsException.php b/library/Zend/Navigation/Exception/OutOfBoundsException.php
index 8ecabb6d09d..bc55e5f6483 100644
--- a/library/Zend/Navigation/Exception/OutOfBoundsException.php
+++ b/library/Zend/Navigation/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException
     extends \OutOfBoundsException
diff --git a/library/Zend/Navigation/Navigation.php b/library/Zend/Navigation/Navigation.php
index f9480fc1f10..9342e8254d9 100644
--- a/library/Zend/Navigation/Navigation.php
+++ b/library/Zend/Navigation/Navigation.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Navigation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Navigation
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Navigation extends AbstractContainer
 {
diff --git a/library/Zend/Navigation/Page/AbstractPage.php b/library/Zend/Navigation/Page/AbstractPage.php
index 4954f5a0dfc..079f61e8dc1 100644
--- a/library/Zend/Navigation/Page/AbstractPage.php
+++ b/library/Zend/Navigation/Page/AbstractPage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Page
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Page;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Page
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPage extends AbstractContainer
 {
diff --git a/library/Zend/Navigation/Page/Mvc.php b/library/Zend/Navigation/Page/Mvc.php
index 26dc0d49deb..ccfb7a7576e 100644
--- a/library/Zend/Navigation/Page/Mvc.php
+++ b/library/Zend/Navigation/Page/Mvc.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Page
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Page;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Page
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mvc extends AbstractPage
 {
diff --git a/library/Zend/Navigation/Page/Uri.php b/library/Zend/Navigation/Page/Uri.php
index 1dacd0bef69..a3b23463fff 100644
--- a/library/Zend/Navigation/Page/Uri.php
+++ b/library/Zend/Navigation/Page/Uri.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Page
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Page;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Page
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Uri extends AbstractPage
 {
diff --git a/library/Zend/Navigation/Service/AbstractNavigationFactory.php b/library/Zend/Navigation/Service/AbstractNavigationFactory.php
index c3d900b1ce1..bcd20c896f8 100644
--- a/library/Zend/Navigation/Service/AbstractNavigationFactory.php
+++ b/library/Zend/Navigation/Service/AbstractNavigationFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Service;
@@ -35,8 +33,6 @@
  *
  * @category  Zend
  * @package   Zend_Navigation
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractNavigationFactory implements FactoryInterface
 {
diff --git a/library/Zend/Navigation/Service/ConstructedNavigationFactory.php b/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
index db597a94745..d638d79512c 100644
--- a/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
+++ b/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Service;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Navigation
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ConstructedNavigationFactory extends AbstractNavigationFactory
 {
@@ -57,4 +53,4 @@ public function getName()
     {
         return 'constructed';
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Navigation/Service/DefaultNavigationFactory.php b/library/Zend/Navigation/Service/DefaultNavigationFactory.php
index 9a8d3dd966d..1b6d5c10b2e 100644
--- a/library/Zend/Navigation/Service/DefaultNavigationFactory.php
+++ b/library/Zend/Navigation/Service/DefaultNavigationFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\Service;
@@ -26,8 +24,6 @@
  *
  * @category  Zend
  * @package   Zend_Navigation
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultNavigationFactory extends AbstractNavigationFactory
 {
@@ -38,4 +34,4 @@ protected function getName()
     {
         return 'default';
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Navigation/View/HelperConfiguration.php b/library/Zend/Navigation/View/HelperConfiguration.php
index 09e3f735c7f..41efae73618 100644
--- a/library/Zend/Navigation/View/HelperConfiguration.php
+++ b/library/Zend/Navigation/View/HelperConfiguration.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Navigation\View;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelperConfiguration implements ConfigurationInterface
 {
diff --git a/library/Zend/OAuth/Client.php b/library/Zend/OAuth/Client.php
index 621c48ac683..19d055be800 100644
--- a/library/Zend/OAuth/Client.php
+++ b/library/Zend/OAuth/Client.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Client extends HttpClient
 {
diff --git a/library/Zend/OAuth/Config/ConfigInterface.php b/library/Zend/OAuth/Config/ConfigInterface.php
index a28641cc551..f4c6e3672b5 100644
--- a/library/Zend/OAuth/Config/ConfigInterface.php
+++ b/library/Zend/OAuth/Config/ConfigInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Config;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ConfigInterface
 {
diff --git a/library/Zend/OAuth/Config/StandardConfig.php b/library/Zend/OAuth/Config/StandardConfig.php
index adc1aa63d23..97667ee63c3 100644
--- a/library/Zend/OAuth/Config/StandardConfig.php
+++ b/library/Zend/OAuth/Config/StandardConfig.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Config;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StandardConfig implements ConfigInterface
 {
diff --git a/library/Zend/OAuth/Consumer.php b/library/Zend/OAuth/Consumer.php
index c08bf2b0018..f80c0313a35 100644
--- a/library/Zend/OAuth/Consumer.php
+++ b/library/Zend/OAuth/Consumer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Consumer extends OAuth
 {
diff --git a/library/Zend/OAuth/Exception/BadMethodCallException.php b/library/Zend/OAuth/Exception/BadMethodCallException.php
index 59717ae78e7..3c061a5740c 100644
--- a/library/Zend/OAuth/Exception/BadMethodCallException.php
+++ b/library/Zend/OAuth/Exception/BadMethodCallException.php
@@ -5,4 +5,4 @@
 class BadMethodCallException
     extends \BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/OAuth/Exception/ExceptionInterface.php b/library/Zend/OAuth/Exception/ExceptionInterface.php
index 701546eedd4..6d7a4fbfaeb 100644
--- a/library/Zend/OAuth/Exception/ExceptionInterface.php
+++ b/library/Zend/OAuth/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/OAuth/Exception/InvalidArgumentException.php b/library/Zend/OAuth/Exception/InvalidArgumentException.php
index 5ce1bb2e65a..7e806c707bb 100644
--- a/library/Zend/OAuth/Exception/InvalidArgumentException.php
+++ b/library/Zend/OAuth/Exception/InvalidArgumentException.php
@@ -5,4 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/OAuth/Exception/RuntimeException.php b/library/Zend/OAuth/Exception/RuntimeException.php
index fd956a1f620..0ee50f49f04 100644
--- a/library/Zend/OAuth/Exception/RuntimeException.php
+++ b/library/Zend/OAuth/Exception/RuntimeException.php
@@ -5,4 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/OAuth/Http.php b/library/Zend/OAuth/Http.php
index 1620fe2d0e5..5742e8787f4 100644
--- a/library/Zend/OAuth/Http.php
+++ b/library/Zend/OAuth/Http.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Http
 {
diff --git a/library/Zend/OAuth/Http/AccessToken.php b/library/Zend/OAuth/Http/AccessToken.php
index a6dd38365fc..2bab71bde44 100644
--- a/library/Zend/OAuth/Http/AccessToken.php
+++ b/library/Zend/OAuth/Http/AccessToken.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Http;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AccessToken extends HTTPClient
 {
diff --git a/library/Zend/OAuth/Http/RequestToken.php b/library/Zend/OAuth/Http/RequestToken.php
index 9612ec3eef0..07f4199ee0d 100644
--- a/library/Zend/OAuth/Http/RequestToken.php
+++ b/library/Zend/OAuth/Http/RequestToken.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Http;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RequestToken extends HTTPClient
 {
diff --git a/library/Zend/OAuth/Http/UserAuthorization.php b/library/Zend/OAuth/Http/UserAuthorization.php
index ae135d535f0..55be705e2e8 100644
--- a/library/Zend/OAuth/Http/UserAuthorization.php
+++ b/library/Zend/OAuth/Http/UserAuthorization.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Http;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UserAuthorization extends HTTPClient
 {
diff --git a/library/Zend/OAuth/Http/Utility.php b/library/Zend/OAuth/Http/Utility.php
index e33e3ed7804..604a5f8cca0 100644
--- a/library/Zend/OAuth/Http/Utility.php
+++ b/library/Zend/OAuth/Http/Utility.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Http;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Utility
 {
diff --git a/library/Zend/OAuth/OAuth.php b/library/Zend/OAuth/OAuth.php
index 47626da0509..8a893659231 100644
--- a/library/Zend/OAuth/OAuth.php
+++ b/library/Zend/OAuth/OAuth.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OAuth
 {
diff --git a/library/Zend/OAuth/Signature/AbstractSignature.php b/library/Zend/OAuth/Signature/AbstractSignature.php
index 10f143ac37c..95371a9f863 100644
--- a/library/Zend/OAuth/Signature/AbstractSignature.php
+++ b/library/Zend/OAuth/Signature/AbstractSignature.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Signature;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractSignature implements SignatureInterface
 {
diff --git a/library/Zend/OAuth/Signature/Hmac.php b/library/Zend/OAuth/Signature/Hmac.php
index 152c412d037..7d68fc41c4c 100644
--- a/library/Zend/OAuth/Signature/Hmac.php
+++ b/library/Zend/OAuth/Signature/Hmac.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth;
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Signature;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hmac extends AbstractSignature
 {
diff --git a/library/Zend/OAuth/Signature/Plaintext.php b/library/Zend/OAuth/Signature/Plaintext.php
index cf35cfa465e..2604041d92b 100644
--- a/library/Zend/OAuth/Signature/Plaintext.php
+++ b/library/Zend/OAuth/Signature/Plaintext.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Signature;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Plaintext extends AbstractSignature
 {
diff --git a/library/Zend/OAuth/Signature/Rsa.php b/library/Zend/OAuth/Signature/Rsa.php
index 3be303d899b..150583e2c8d 100644
--- a/library/Zend/OAuth/Signature/Rsa.php
+++ b/library/Zend/OAuth/Signature/Rsa.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth;
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Signature;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rsa extends AbstractSignature
 {
diff --git a/library/Zend/OAuth/Signature/SignatureInterface.php b/library/Zend/OAuth/Signature/SignatureInterface.php
index bd551098dd7..000fa5c47a4 100644
--- a/library/Zend/OAuth/Signature/SignatureInterface.php
+++ b/library/Zend/OAuth/Signature/SignatureInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Signature;
diff --git a/library/Zend/OAuth/Token/AbstractToken.php b/library/Zend/OAuth/Token/AbstractToken.php
index 74e3252afe7..20f3e63fe1a 100644
--- a/library/Zend/OAuth/Token/AbstractToken.php
+++ b/library/Zend/OAuth/Token/AbstractToken.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Token;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractToken implements TokenInterface
 {
diff --git a/library/Zend/OAuth/Token/Access.php b/library/Zend/OAuth/Token/Access.php
index 5bc4e31dc00..e2e7b985411 100644
--- a/library/Zend/OAuth/Token/Access.php
+++ b/library/Zend/OAuth/Token/Access.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Token;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Access extends AbstractToken
 {
diff --git a/library/Zend/OAuth/Token/AuthorizedRequest.php b/library/Zend/OAuth/Token/AuthorizedRequest.php
index fd067f3ad9a..1d9b2260c80 100644
--- a/library/Zend/OAuth/Token/AuthorizedRequest.php
+++ b/library/Zend/OAuth/Token/AuthorizedRequest.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Token;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AuthorizedRequest extends AbstractToken
 {
diff --git a/library/Zend/OAuth/Token/Request.php b/library/Zend/OAuth/Token/Request.php
index 1522790ba52..997926f6629 100644
--- a/library/Zend/OAuth/Token/Request.php
+++ b/library/Zend/OAuth/Token/Request.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Token;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Request extends AbstractToken
 {
diff --git a/library/Zend/OAuth/Token/TokenInterface.php b/library/Zend/OAuth/Token/TokenInterface.php
index f12c7e63962..b93eeec60cf 100644
--- a/library/Zend/OAuth/Token/TokenInterface.php
+++ b/library/Zend/OAuth/Token/TokenInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OAuth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OAuth\Token;
diff --git a/library/Zend/OpenId/Consumer/GenericConsumer.php b/library/Zend/OpenId/Consumer/GenericConsumer.php
index f2b81a9f7b2..a8a2c005c28 100644
--- a/library/Zend/OpenId/Consumer/GenericConsumer.php
+++ b/library/Zend/OpenId/Consumer/GenericConsumer.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Consumer;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericConsumer
 {
diff --git a/library/Zend/OpenId/Consumer/Storage/AbstractStorage.php b/library/Zend/OpenId/Consumer/Storage/AbstractStorage.php
index 624f9f622b8..fe56ea65bfa 100644
--- a/library/Zend/OpenId/Consumer/Storage/AbstractStorage.php
+++ b/library/Zend/OpenId/Consumer/Storage/AbstractStorage.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Consumer\Storage;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractStorage
 {
diff --git a/library/Zend/OpenId/Consumer/Storage/File.php b/library/Zend/OpenId/Consumer/Storage/File.php
index d4e7202a788..1689db8ff24 100644
--- a/library/Zend/OpenId/Consumer/Storage/File.php
+++ b/library/Zend/OpenId/Consumer/Storage/File.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Consumer\Storage;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class File extends AbstractStorage
 {
diff --git a/library/Zend/OpenId/Exception/ExceptionInterface.php b/library/Zend/OpenId/Exception/ExceptionInterface.php
index 4b4e03358b0..3f1634e17dc 100644
--- a/library/Zend/OpenId/Exception/ExceptionInterface.php
+++ b/library/Zend/OpenId/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/OpenId/Exception/InvalidArgumentException.php b/library/Zend/OpenId/Exception/InvalidArgumentException.php
index f6ba3746d8f..a046b1704df 100644
--- a/library/Zend/OpenId/Exception/InvalidArgumentException.php
+++ b/library/Zend/OpenId/Exception/InvalidArgumentException.php
@@ -5,4 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/OpenId/Exception/RuntimeException.php b/library/Zend/OpenId/Exception/RuntimeException.php
index 2a7ade472f3..ab63bec1e9e 100644
--- a/library/Zend/OpenId/Exception/RuntimeException.php
+++ b/library/Zend/OpenId/Exception/RuntimeException.php
@@ -5,4 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/OpenId/Extension/AbstractExtension.php b/library/Zend/OpenId/Extension/AbstractExtension.php
index 8f2aa610b55..52e0ebe7766 100644
--- a/library/Zend/OpenId/Extension/AbstractExtension.php
+++ b/library/Zend/OpenId/Extension/AbstractExtension.php
@@ -15,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Extension;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractExtension
 {
diff --git a/library/Zend/OpenId/Extension/Sreg.php b/library/Zend/OpenId/Extension/Sreg.php
index 272a600a9bb..37ff32028d8 100644
--- a/library/Zend/OpenId/Extension/Sreg.php
+++ b/library/Zend/OpenId/Extension/Sreg.php
@@ -15,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Extension;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sreg extends AbstractExtension
 {
diff --git a/library/Zend/OpenId/OpenId.php b/library/Zend/OpenId/OpenId.php
index 7d3b04f4793..6d35bc0e8d4 100644
--- a/library/Zend/OpenId/OpenId.php
+++ b/library/Zend/OpenId/OpenId.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OpenId
 {
diff --git a/library/Zend/OpenId/Provider/GenericProvider.php b/library/Zend/OpenId/Provider/GenericProvider.php
index 7526e295315..ca0581ce930 100644
--- a/library/Zend/OpenId/Provider/GenericProvider.php
+++ b/library/Zend/OpenId/Provider/GenericProvider.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Provider;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GenericProvider
 {
diff --git a/library/Zend/OpenId/Provider/Storage/AbstractStorage.php b/library/Zend/OpenId/Provider/Storage/AbstractStorage.php
index 7388d018c29..ab7931e65d4 100644
--- a/library/Zend/OpenId/Provider/Storage/AbstractStorage.php
+++ b/library/Zend/OpenId/Provider/Storage/AbstractStorage.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Provider\Storage;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractStorage
 {
diff --git a/library/Zend/OpenId/Provider/Storage/File.php b/library/Zend/OpenId/Provider/Storage/File.php
index 17178547b29..0c43a9bc4e5 100644
--- a/library/Zend/OpenId/Provider/Storage/File.php
+++ b/library/Zend/OpenId/Provider/Storage/File.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Provider\Storage;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class File extends AbstractStorage
 {
diff --git a/library/Zend/OpenId/Provider/User/AbstractUser.php b/library/Zend/OpenId/Provider/User/AbstractUser.php
index db77451ebc7..13069980ea4 100644
--- a/library/Zend/OpenId/Provider/User/AbstractUser.php
+++ b/library/Zend/OpenId/Provider/User/AbstractUser.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend\OpenId\Provider\GenericProvider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Provider\User;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend\OpenId\Provider\GenericProvider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractUser
 {
diff --git a/library/Zend/OpenId/Provider/User/Session.php b/library/Zend/OpenId/Provider/User/Session.php
index 084fec60e96..3dc89b47a58 100644
--- a/library/Zend/OpenId/Provider/User/Session.php
+++ b/library/Zend/OpenId/Provider/User/Session.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\OpenId\Provider\User;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Session extends AbstractUser
 {
diff --git a/library/Zend/Paginator/Adapter/AdapterInterface.php b/library/Zend/Paginator/Adapter/AdapterInterface.php
index 474bfb788fa..585a78c0557 100644
--- a/library/Zend/Paginator/Adapter/AdapterInterface.php
+++ b/library/Zend/Paginator/Adapter/AdapterInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -17,8 +15,6 @@
  *
  * @category   Zend
  * @package    Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface extends Countable
 {
diff --git a/library/Zend/Paginator/Adapter/ArrayAdapter.php b/library/Zend/Paginator/Adapter/ArrayAdapter.php
index 317711e70e2..684293de5b3 100644
--- a/library/Zend/Paginator/Adapter/ArrayAdapter.php
+++ b/library/Zend/Paginator/Adapter/ArrayAdapter.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -13,8 +11,6 @@
 /**
  * @category   Zend
  * @package    Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayAdapter implements AdapterInterface
 {
diff --git a/library/Zend/Paginator/Adapter/DbSelect.php b/library/Zend/Paginator/Adapter/DbSelect.php
index f0798923602..b8265e4559a 100644
--- a/library/Zend/Paginator/Adapter/DbSelect.php
+++ b/library/Zend/Paginator/Adapter/DbSelect.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -15,8 +13,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbSelect implements AdapterInterface
 {
diff --git a/library/Zend/Paginator/Adapter/DbTableSelect.php b/library/Zend/Paginator/Adapter/DbTableSelect.php
index b85eabf8d0e..727f38c0810 100644
--- a/library/Zend/Paginator/Adapter/DbTableSelect.php
+++ b/library/Zend/Paginator/Adapter/DbTableSelect.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -13,8 +11,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbTableSelect extends DbSelect
 {
diff --git a/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php b/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
index 315be04dea6..c5ad36712fa 100644
--- a/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -16,8 +14,6 @@
  * @category   Zend
  * @package    Zend_Paginator
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {}
diff --git a/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
index 990c66c6b56..f8289403a78 100644
--- a/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -16,8 +14,6 @@
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/Paginator/Adapter/Exception/RuntimeException.php b/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
index fb5b6cc951c..1e80d527465 100644
--- a/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -16,8 +14,6 @@
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php b/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
index 552245ed55d..b11a59bc473 100644
--- a/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -16,8 +14,6 @@
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends Exception\UnexpectedValueException implements 
     ExceptionInterface
diff --git a/library/Zend/Paginator/Adapter/Iterator.php b/library/Zend/Paginator/Adapter/Iterator.php
index 4ce895bebc0..9bb8c400e50 100644
--- a/library/Zend/Paginator/Adapter/Iterator.php
+++ b/library/Zend/Paginator/Adapter/Iterator.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -15,8 +13,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Iterator implements AdapterInterface
 {
diff --git a/library/Zend/Paginator/Adapter/Null.php b/library/Zend/Paginator/Adapter/Null.php
index bd821784287..f3b02e891b2 100644
--- a/library/Zend/Paginator/Adapter/Null.php
+++ b/library/Zend/Paginator/Adapter/Null.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -13,8 +11,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Null implements AdapterInterface
 {
diff --git a/library/Zend/Paginator/AdapterAggregateInterface.php b/library/Zend/Paginator/AdapterAggregateInterface.php
index 708ab096495..5edf55821cd 100644
--- a/library/Zend/Paginator/AdapterAggregateInterface.php
+++ b/library/Zend/Paginator/AdapterAggregateInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -18,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Paginator
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterAggregateInterface
 {
diff --git a/library/Zend/Paginator/AdapterPluginManager.php b/library/Zend/Paginator/AdapterPluginManager.php
index 7d63919e76e..b6274e89170 100644
--- a/library/Zend/Paginator/AdapterPluginManager.php
+++ b/library/Zend/Paginator/AdapterPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Paginator;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AdapterPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Paginator/Exception/ExceptionInterface.php b/library/Zend/Paginator/Exception/ExceptionInterface.php
index 5795a631be1..496b80e9a4d 100644
--- a/library/Zend/Paginator/Exception/ExceptionInterface.php
+++ b/library/Zend/Paginator/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -13,8 +11,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Paginator/Exception/InvalidArgumentException.php b/library/Zend/Paginator/Exception/InvalidArgumentException.php
index 87af18d6562..f09465b5de2 100644
--- a/library/Zend/Paginator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Paginator/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -14,8 +12,6 @@
  * @category   Zend
  * @package    Zend\Paginator
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Paginator/Exception/RuntimeException.php b/library/Zend/Paginator/Exception/RuntimeException.php
index 58223f0f950..d3e77bf00ff 100644
--- a/library/Zend/Paginator/Exception/RuntimeException.php
+++ b/library/Zend/Paginator/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -14,8 +12,6 @@
  * @category   Zend
  * @package    Zend\Paginator
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Paginator/Exception/UnexpectedValueException.php b/library/Zend/Paginator/Exception/UnexpectedValueException.php
index d6770974f37..5cc61573063 100644
--- a/library/Zend/Paginator/Exception/UnexpectedValueException.php
+++ b/library/Zend/Paginator/Exception/UnexpectedValueException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -14,8 +12,6 @@
  * @category   Zend
  * @package    Zend\Paginator
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException
     extends \UnexpectedValueException
diff --git a/library/Zend/Paginator/Paginator.php b/library/Zend/Paginator/Paginator.php
index 66b40e348ed..d28cf32d214 100644
--- a/library/Zend/Paginator/Paginator.php
+++ b/library/Zend/Paginator/Paginator.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -30,8 +28,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Paginator implements Countable, IteratorAggregate
 {
diff --git a/library/Zend/Paginator/ScrollingStyle/All.php b/library/Zend/Paginator/ScrollingStyle/All.php
index 314cf2de14d..0bd2c438167 100644
--- a/library/Zend/Paginator/ScrollingStyle/All.php
+++ b/library/Zend/Paginator/ScrollingStyle/All.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -19,8 +17,6 @@
  *
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class All implements ScrollingStyleInterface
 {
diff --git a/library/Zend/Paginator/ScrollingStyle/Elastic.php b/library/Zend/Paginator/ScrollingStyle/Elastic.php
index 3809a9d5e49..aec0bb54474 100644
--- a/library/Zend/Paginator/ScrollingStyle/Elastic.php
+++ b/library/Zend/Paginator/ScrollingStyle/Elastic.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -20,8 +18,6 @@
  * @link       http://www.google.com/search?q=Zend+Framework
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Elastic extends Sliding
 {
diff --git a/library/Zend/Paginator/ScrollingStyle/Jumping.php b/library/Zend/Paginator/ScrollingStyle/Jumping.php
index 6bfbe6c0cb0..bf33b4d0655 100644
--- a/library/Zend/Paginator/ScrollingStyle/Jumping.php
+++ b/library/Zend/Paginator/ScrollingStyle/Jumping.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -19,8 +17,6 @@
  *
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Jumping implements ScrollingStyleInterface
 {
diff --git a/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php b/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
index 95375c7d8d1..c88f9475ef5 100644
--- a/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
+++ b/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -15,8 +13,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ScrollingStyleInterface
 {
diff --git a/library/Zend/Paginator/ScrollingStyle/Sliding.php b/library/Zend/Paginator/ScrollingStyle/Sliding.php
index e0171422f3d..12d78f88347 100644
--- a/library/Zend/Paginator/ScrollingStyle/Sliding.php
+++ b/library/Zend/Paginator/ScrollingStyle/Sliding.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -21,8 +19,6 @@
  * @link       http://search.yahoo.com/search?p=Zend+Framework
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sliding implements ScrollingStyleInterface
 {
diff --git a/library/Zend/Paginator/ScrollingStylePluginManager.php b/library/Zend/Paginator/ScrollingStylePluginManager.php
index 73ca0ca09e9..8c04076486c 100644
--- a/library/Zend/Paginator/ScrollingStylePluginManager.php
+++ b/library/Zend/Paginator/ScrollingStylePluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Paginator;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ScrollingStylePluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Paginator/SerializableLimitIterator.php b/library/Zend/Paginator/SerializableLimitIterator.php
index 03c2f90e04f..549a1d59c3c 100644
--- a/library/Zend/Paginator/SerializableLimitIterator.php
+++ b/library/Zend/Paginator/SerializableLimitIterator.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Paginator
  */
 
@@ -15,8 +13,6 @@
 /**
  * @category   Zend
  * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SerializableLimitIterator extends \LimitIterator implements \Serializable, \ArrayAccess
 {
diff --git a/library/Zend/Pdf/Action/AbstractAction.php b/library/Zend/Pdf/Action/AbstractAction.php
index 9993c1ee69d..2fe3a750c3d 100644
--- a/library/Zend/Pdf/Action/AbstractAction.php
+++ b/library/Zend/Pdf/Action/AbstractAction.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAction extends Pdf\InternalStructure\NavigationTarget implements \RecursiveIterator, \Countable
 {
diff --git a/library/Zend/Pdf/Action/GoTo3DView.php b/library/Zend/Pdf/Action/GoTo3DView.php
index 1be4a3eb3ff..00e9dad3b33 100644
--- a/library/Zend/Pdf/Action/GoTo3DView.php
+++ b/library/Zend/Pdf/Action/GoTo3DView.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GoTo3DView extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/GoToAction.php b/library/Zend/Pdf/Action/GoToAction.php
index 03ef362821a..c6696ecc5d8 100644
--- a/library/Zend/Pdf/Action/GoToAction.php
+++ b/library/Zend/Pdf/Action/GoToAction.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GoToAction extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/GoToE.php b/library/Zend/Pdf/Action/GoToE.php
index e35aeb73007..5b01c950a3a 100644
--- a/library/Zend/Pdf/Action/GoToE.php
+++ b/library/Zend/Pdf/Action/GoToE.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GoToE extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/GoToR.php b/library/Zend/Pdf/Action/GoToR.php
index 4263f2a44d8..fd7d0f394b6 100644
--- a/library/Zend/Pdf/Action/GoToR.php
+++ b/library/Zend/Pdf/Action/GoToR.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GoToR extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Hide.php b/library/Zend/Pdf/Action/Hide.php
index 19809ff467f..2fa8182be15 100644
--- a/library/Zend/Pdf/Action/Hide.php
+++ b/library/Zend/Pdf/Action/Hide.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hide extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/ImportData.php b/library/Zend/Pdf/Action/ImportData.php
index 5352634e88e..2c1f96a49f5 100644
--- a/library/Zend/Pdf/Action/ImportData.php
+++ b/library/Zend/Pdf/Action/ImportData.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ImportData extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/JavaScript.php b/library/Zend/Pdf/Action/JavaScript.php
index 6edc3a5551e..073c02ab37b 100644
--- a/library/Zend/Pdf/Action/JavaScript.php
+++ b/library/Zend/Pdf/Action/JavaScript.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class JavaScript extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Launch.php b/library/Zend/Pdf/Action/Launch.php
index 91efa4ddef6..f8a8c2cbcc1 100644
--- a/library/Zend/Pdf/Action/Launch.php
+++ b/library/Zend/Pdf/Action/Launch.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Launch extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Movie.php b/library/Zend/Pdf/Action/Movie.php
index d22e3699c2f..4d73252dbf2 100644
--- a/library/Zend/Pdf/Action/Movie.php
+++ b/library/Zend/Pdf/Action/Movie.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Movie extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Named.php b/library/Zend/Pdf/Action/Named.php
index c56063c37c0..0b3793574a9 100644
--- a/library/Zend/Pdf/Action/Named.php
+++ b/library/Zend/Pdf/Action/Named.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Named extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Rendition.php b/library/Zend/Pdf/Action/Rendition.php
index dbef97365be..ea3c23c42d5 100644
--- a/library/Zend/Pdf/Action/Rendition.php
+++ b/library/Zend/Pdf/Action/Rendition.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rendition extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/ResetForm.php b/library/Zend/Pdf/Action/ResetForm.php
index d67961a37c0..7ea538fc6d4 100644
--- a/library/Zend/Pdf/Action/ResetForm.php
+++ b/library/Zend/Pdf/Action/ResetForm.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ResetForm extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/SetOCGState.php b/library/Zend/Pdf/Action/SetOCGState.php
index e8b1660e732..43df08e6be9 100644
--- a/library/Zend/Pdf/Action/SetOCGState.php
+++ b/library/Zend/Pdf/Action/SetOCGState.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SetOCGState extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Sound.php b/library/Zend/Pdf/Action/Sound.php
index 45383b8e30f..1c147f45ffc 100644
--- a/library/Zend/Pdf/Action/Sound.php
+++ b/library/Zend/Pdf/Action/Sound.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sound extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/SubmitForm.php b/library/Zend/Pdf/Action/SubmitForm.php
index 5d4fb4e1f0f..36b9dca6eca 100644
--- a/library/Zend/Pdf/Action/SubmitForm.php
+++ b/library/Zend/Pdf/Action/SubmitForm.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SubmitForm extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Thread.php b/library/Zend/Pdf/Action/Thread.php
index c14834ee2d1..953f3cb5c26 100644
--- a/library/Zend/Pdf/Action/Thread.php
+++ b/library/Zend/Pdf/Action/Thread.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Thread extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Trans.php b/library/Zend/Pdf/Action/Trans.php
index c0ca1c6d5c5..10c6c354416 100644
--- a/library/Zend/Pdf/Action/Trans.php
+++ b/library/Zend/Pdf/Action/Trans.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Trans extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Unknown.php b/library/Zend/Pdf/Action/Unknown.php
index 22f59511720..0a9f76049e3 100644
--- a/library/Zend/Pdf/Action/Unknown.php
+++ b/library/Zend/Pdf/Action/Unknown.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Unknown extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Action/Uri.php b/library/Zend/Pdf/Action/Uri.php
index e1d06cbd917..b6c4daa1cd4 100644
--- a/library/Zend/Pdf/Action/Uri.php
+++ b/library/Zend/Pdf/Action/Uri.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Action;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Uri extends AbstractAction
 {
diff --git a/library/Zend/Pdf/Annotation/AbstractAnnotation.php b/library/Zend/Pdf/Annotation/AbstractAnnotation.php
index a07ff6a0fcb..8f5adeea314 100644
--- a/library/Zend/Pdf/Annotation/AbstractAnnotation.php
+++ b/library/Zend/Pdf/Annotation/AbstractAnnotation.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Annotation;
@@ -33,8 +31,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAnnotation
 {
diff --git a/library/Zend/Pdf/Annotation/FileAttachment.php b/library/Zend/Pdf/Annotation/FileAttachment.php
index e93c5317e8a..a473b7fb7ee 100644
--- a/library/Zend/Pdf/Annotation/FileAttachment.php
+++ b/library/Zend/Pdf/Annotation/FileAttachment.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Annotation;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FileAttachment extends AbstractAnnotation
 {
diff --git a/library/Zend/Pdf/Annotation/Link.php b/library/Zend/Pdf/Annotation/Link.php
index 38eccaed1ab..ea958ebc4a8 100644
--- a/library/Zend/Pdf/Annotation/Link.php
+++ b/library/Zend/Pdf/Annotation/Link.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Annotation;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Link extends AbstractAnnotation
 {
diff --git a/library/Zend/Pdf/Annotation/Markup.php b/library/Zend/Pdf/Annotation/Markup.php
index b0423b46717..9b3cb6bd6e0 100644
--- a/library/Zend/Pdf/Annotation/Markup.php
+++ b/library/Zend/Pdf/Annotation/Markup.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Annotation;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Markup extends AbstractAnnotation
 {
diff --git a/library/Zend/Pdf/Annotation/Text.php b/library/Zend/Pdf/Annotation/Text.php
index 2e0f4dd91c4..ab26ea071cc 100644
--- a/library/Zend/Pdf/Annotation/Text.php
+++ b/library/Zend/Pdf/Annotation/Text.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Annotation;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Annotation
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Text extends AbstractAnnotation
 {
diff --git a/library/Zend/Pdf/BinaryParser/AbstractBinaryParser.php b/library/Zend/Pdf/BinaryParser/AbstractBinaryParser.php
index 8a6679a0209..3bc6a9c844b 100644
--- a/library/Zend/Pdf/BinaryParser/AbstractBinaryParser.php
+++ b/library/Zend/Pdf/BinaryParser/AbstractBinaryParser.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser;
@@ -37,8 +35,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractBinaryParser
 {
diff --git a/library/Zend/Pdf/BinaryParser/DataSource/AbstractDataSource.php b/library/Zend/Pdf/BinaryParser/DataSource/AbstractDataSource.php
index 052f7f0cee6..65ed31481df 100644
--- a/library/Zend/Pdf/BinaryParser/DataSource/AbstractDataSource.php
+++ b/library/Zend/Pdf/BinaryParser/DataSource/AbstractDataSource.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\DataSource;
@@ -48,8 +46,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractDataSource
 {
diff --git a/library/Zend/Pdf/BinaryParser/DataSource/File.php b/library/Zend/Pdf/BinaryParser/DataSource/File.php
index d8cf9073cc1..56b72cb533c 100644
--- a/library/Zend/Pdf/BinaryParser/DataSource/File.php
+++ b/library/Zend/Pdf/BinaryParser/DataSource/File.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\DataSource;
@@ -33,8 +31,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class File extends AbstractDataSource
 {
diff --git a/library/Zend/Pdf/BinaryParser/DataSource/String.php b/library/Zend/Pdf/BinaryParser/DataSource/String.php
index 3231e8e9db8..a2c865540c6 100644
--- a/library/Zend/Pdf/BinaryParser/DataSource/String.php
+++ b/library/Zend/Pdf/BinaryParser/DataSource/String.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\DataSource;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_BinaryParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class String extends AbstractDataSource
 {
diff --git a/library/Zend/Pdf/BinaryParser/Font/AbstractFont.php b/library/Zend/Pdf/BinaryParser/Font/AbstractFont.php
index 3d7315bfb35..80678991579 100644
--- a/library/Zend/Pdf/BinaryParser/Font/AbstractFont.php
+++ b/library/Zend/Pdf/BinaryParser/Font/AbstractFont.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\Font;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFont extends BinaryParser\AbstractBinaryParser
 {
diff --git a/library/Zend/Pdf/BinaryParser/Font/OpenType/AbstractOpenType.php b/library/Zend/Pdf/BinaryParser/Font/OpenType/AbstractOpenType.php
index d916b5a17d1..3706d38e065 100644
--- a/library/Zend/Pdf/BinaryParser/Font/OpenType/AbstractOpenType.php
+++ b/library/Zend/Pdf/BinaryParser/Font/OpenType/AbstractOpenType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\Font\OpenType;
@@ -46,8 +44,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractOpenType extends Pdf\BinaryParser\Font\AbstractFont
 {
diff --git a/library/Zend/Pdf/BinaryParser/Font/OpenType/TrueType.php b/library/Zend/Pdf/BinaryParser/Font/OpenType/TrueType.php
index 64b0332e490..82a68e03f56 100644
--- a/library/Zend/Pdf/BinaryParser/Font/OpenType/TrueType.php
+++ b/library/Zend/Pdf/BinaryParser/Font/OpenType/TrueType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\Font\OpenType;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_PDF
  * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TrueType extends AbstractOpenType
 {
diff --git a/library/Zend/Pdf/BinaryParser/Image/AbstractImage.php b/library/Zend/Pdf/BinaryParser/Image/AbstractImage.php
index 8c3766f3bb0..b650025451a 100644
--- a/library/Zend/Pdf/BinaryParser/Image/AbstractImage.php
+++ b/library/Zend/Pdf/BinaryParser/Image/AbstractImage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\Image;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractImage extends BinaryParser\AbstractBinaryParser
 {
diff --git a/library/Zend/Pdf/BinaryParser/Image/Png.php b/library/Zend/Pdf/BinaryParser/Image/Png.php
index f5fb696bc90..db497588ec7 100644
--- a/library/Zend/Pdf/BinaryParser/Image/Png.php
+++ b/library/Zend/Pdf/BinaryParser/Image/Png.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\BinaryParser\Image;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Png extends AbstractImage
 {
diff --git a/library/Zend/Pdf/Cmap/AbstractCmap.php b/library/Zend/Pdf/Cmap/AbstractCmap.php
index 402e4c069ec..a36dffac280 100644
--- a/library/Zend/Pdf/Cmap/AbstractCmap.php
+++ b/library/Zend/Pdf/Cmap/AbstractCmap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Cmap;
@@ -49,8 +47,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCmap
 {
diff --git a/library/Zend/Pdf/Cmap/ByteEncoding.php b/library/Zend/Pdf/Cmap/ByteEncoding.php
index cd867366ee0..265798858b8 100644
--- a/library/Zend/Pdf/Cmap/ByteEncoding.php
+++ b/library/Zend/Pdf/Cmap/ByteEncoding.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Cmap;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ByteEncoding extends AbstractCmap
 {
diff --git a/library/Zend/Pdf/Cmap/SegmentToDelta.php b/library/Zend/Pdf/Cmap/SegmentToDelta.php
index 8c3ecabcdf1..e10a50319da 100644
--- a/library/Zend/Pdf/Cmap/SegmentToDelta.php
+++ b/library/Zend/Pdf/Cmap/SegmentToDelta.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Cmap;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SegmentToDelta extends AbstractCmap
 {
diff --git a/library/Zend/Pdf/Cmap/StaticByteEncoding.php b/library/Zend/Pdf/Cmap/StaticByteEncoding.php
index 50b3efb743f..06cc2afe747 100644
--- a/library/Zend/Pdf/Cmap/StaticByteEncoding.php
+++ b/library/Zend/Pdf/Cmap/StaticByteEncoding.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Cmap;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StaticByteEncoding extends ByteEncoding
 {
diff --git a/library/Zend/Pdf/Cmap/TrimmedTable.php b/library/Zend/Pdf/Cmap/TrimmedTable.php
index 4feca9c6d49..7fba43a0e53 100644
--- a/library/Zend/Pdf/Cmap/TrimmedTable.php
+++ b/library/Zend/Pdf/Cmap/TrimmedTable.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Cmap;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Font
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TrimmedTable extends AbstractCmap
 {
diff --git a/library/Zend/Pdf/Color.php b/library/Zend/Pdf/Color.php
index c1641a11a1c..bcd991238e2 100644
--- a/library/Zend/Pdf/Color.php
+++ b/library/Zend/Pdf/Color.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Color
 {
diff --git a/library/Zend/Pdf/Color/Cmyk.php b/library/Zend/Pdf/Color/Cmyk.php
index 8a9233f55dd..893619589e0 100644
--- a/library/Zend/Pdf/Color/Cmyk.php
+++ b/library/Zend/Pdf/Color/Cmyk.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Color;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cmyk implements ColorInterface
 {
diff --git a/library/Zend/Pdf/Color/ColorInterface.php b/library/Zend/Pdf/Color/ColorInterface.php
index 6104cfff724..cde4f77e1b6 100644
--- a/library/Zend/Pdf/Color/ColorInterface.php
+++ b/library/Zend/Pdf/Color/ColorInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Color;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ColorInterface
 {
diff --git a/library/Zend/Pdf/Color/GrayScale.php b/library/Zend/Pdf/Color/GrayScale.php
index fedbf6115b3..a37c37f0394 100644
--- a/library/Zend/Pdf/Color/GrayScale.php
+++ b/library/Zend/Pdf/Color/GrayScale.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Color;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GrayScale implements ColorInterface
 {
diff --git a/library/Zend/Pdf/Color/Html.php b/library/Zend/Pdf/Color/Html.php
index ac08501eefc..4c26e36077f 100644
--- a/library/Zend/Pdf/Color/Html.php
+++ b/library/Zend/Pdf/Color/Html.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Color;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Html implements ColorInterface
 {
diff --git a/library/Zend/Pdf/Color/Rgb.php b/library/Zend/Pdf/Color/Rgb.php
index 40434767270..fb16f044350 100644
--- a/library/Zend/Pdf/Color/Rgb.php
+++ b/library/Zend/Pdf/Color/Rgb.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Color;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @subpackage Zend_PDF_Color
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Rgb implements ColorInterface
 {
diff --git a/library/Zend/Pdf/Destination/AbstractDestination.php b/library/Zend/Pdf/Destination/AbstractDestination.php
index b50a171561a..0398a08619d 100644
--- a/library/Zend/Pdf/Destination/AbstractDestination.php
+++ b/library/Zend/Pdf/Destination/AbstractDestination.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractDestination extends Pdf\InternalStructure\NavigationTarget
 {
diff --git a/library/Zend/Pdf/Destination/AbstractExplicitDestination.php b/library/Zend/Pdf/Destination/AbstractExplicitDestination.php
index 80bcff7caf1..63177e4f590 100644
--- a/library/Zend/Pdf/Destination/AbstractExplicitDestination.php
+++ b/library/Zend/Pdf/Destination/AbstractExplicitDestination.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractExplicitDestination extends AbstractDestination
 {
diff --git a/library/Zend/Pdf/Destination/Fit.php b/library/Zend/Pdf/Destination/Fit.php
index 7c511c08437..448e882547a 100644
--- a/library/Zend/Pdf/Destination/Fit.php
+++ b/library/Zend/Pdf/Destination/Fit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -37,8 +35,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Fit extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/FitBoundingBox.php b/library/Zend/Pdf/Destination/FitBoundingBox.php
index 904d99a645c..f44ef1b2889 100644
--- a/library/Zend/Pdf/Destination/FitBoundingBox.php
+++ b/library/Zend/Pdf/Destination/FitBoundingBox.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -37,8 +35,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FitBoundingBox extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php b/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php
index ca110744be4..2efc3cfa137 100644
--- a/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php
+++ b/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -36,8 +34,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FitBoundingBoxHorizontally extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php b/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php
index d2175215b00..b8629ce79a9 100644
--- a/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php
+++ b/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -36,8 +34,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FitBoundingBoxVertically extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/FitHorizontally.php b/library/Zend/Pdf/Destination/FitHorizontally.php
index 70faf7eec37..57251cb60d8 100644
--- a/library/Zend/Pdf/Destination/FitHorizontally.php
+++ b/library/Zend/Pdf/Destination/FitHorizontally.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FitHorizontally extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/FitRectangle.php b/library/Zend/Pdf/Destination/FitRectangle.php
index ccbed5d5f50..d7e95ae4afc 100644
--- a/library/Zend/Pdf/Destination/FitRectangle.php
+++ b/library/Zend/Pdf/Destination/FitRectangle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -37,8 +35,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FitRectangle extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/FitVertically.php b/library/Zend/Pdf/Destination/FitVertically.php
index f199376aae3..e2bfdaa9984 100644
--- a/library/Zend/Pdf/Destination/FitVertically.php
+++ b/library/Zend/Pdf/Destination/FitVertically.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FitVertically extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/Named.php b/library/Zend/Pdf/Destination/Named.php
index 3552bde7b53..f4facd79a01 100644
--- a/library/Zend/Pdf/Destination/Named.php
+++ b/library/Zend/Pdf/Destination/Named.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Named extends AbstractDestination
 {
diff --git a/library/Zend/Pdf/Destination/Unknown.php b/library/Zend/Pdf/Destination/Unknown.php
index c90ed23265b..f2a8eb0d5d6 100644
--- a/library/Zend/Pdf/Destination/Unknown.php
+++ b/library/Zend/Pdf/Destination/Unknown.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Unknown extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Destination/Zoom.php b/library/Zend/Pdf/Destination/Zoom.php
index 1a1c4841cc7..aa8c1c307c5 100644
--- a/library/Zend/Pdf/Destination/Zoom.php
+++ b/library/Zend/Pdf/Destination/Zoom.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Destination;
@@ -37,8 +35,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Destination
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zoom extends AbstractExplicitDestination
 {
diff --git a/library/Zend/Pdf/Exception/BadMethodCallException.php b/library/Zend/Pdf/Exception/BadMethodCallException.php
index e6a36f67a27..d3b7e24038f 100644
--- a/library/Zend/Pdf/Exception/BadMethodCallException.php
+++ b/library/Zend/Pdf/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException
     extends \BadMethodCallException
diff --git a/library/Zend/Pdf/Exception/BinaryParserException.php b/library/Zend/Pdf/Exception/BinaryParserException.php
index 9ffa8ef0fa7..260c4610559 100644
--- a/library/Zend/Pdf/Exception/BinaryParserException.php
+++ b/library/Zend/Pdf/Exception/BinaryParserException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BinaryParserException
     extends RuntimeException
diff --git a/library/Zend/Pdf/Exception/CorruptedFontException.php b/library/Zend/Pdf/Exception/CorruptedFontException.php
index c47b6d9a9dc..83c0b7ce52a 100644
--- a/library/Zend/Pdf/Exception/CorruptedFontException.php
+++ b/library/Zend/Pdf/Exception/CorruptedFontException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CorruptedFontException
     extends RuntimeException
diff --git a/library/Zend/Pdf/Exception/CorruptedImageException.php b/library/Zend/Pdf/Exception/CorruptedImageException.php
index 8d2cce69fd6..3f3e9ea8425 100644
--- a/library/Zend/Pdf/Exception/CorruptedImageException.php
+++ b/library/Zend/Pdf/Exception/CorruptedImageException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CorruptedImageException
     extends RuntimeException
diff --git a/library/Zend/Pdf/Exception/CorruptedPdfException.php b/library/Zend/Pdf/Exception/CorruptedPdfException.php
index 2b0218f16ce..43f3aef7d62 100644
--- a/library/Zend/Pdf/Exception/CorruptedPdfException.php
+++ b/library/Zend/Pdf/Exception/CorruptedPdfException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,10 +26,8 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CorruptedPdfException
     extends RuntimeException
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Pdf/Exception/DomainException.php b/library/Zend/Pdf/Exception/DomainException.php
index 2a3fd88ea43..a31ad708347 100644
--- a/library/Zend/Pdf/Exception/DomainException.php
+++ b/library/Zend/Pdf/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException
     extends \DomainException
diff --git a/library/Zend/Pdf/Exception/ExceptionInterface.php b/library/Zend/Pdf/Exception/ExceptionInterface.php
index 6152c9cca43..c30a5b652ad 100644
--- a/library/Zend/Pdf/Exception/ExceptionInterface.php
+++ b/library/Zend/Pdf/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Pdf/Exception/IOException.php b/library/Zend/Pdf/Exception/IOException.php
index 16b10a43f46..b78e0cd8846 100644
--- a/library/Zend/Pdf/Exception/IOException.php
+++ b/library/Zend/Pdf/Exception/IOException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IOException
     extends RuntimeException
diff --git a/library/Zend/Pdf/Exception/InvalidArgumentException.php b/library/Zend/Pdf/Exception/InvalidArgumentException.php
index 83596bcb4b9..a5d2953712f 100644
--- a/library/Zend/Pdf/Exception/InvalidArgumentException.php
+++ b/library/Zend/Pdf/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Pdf/Exception/LengthException.php b/library/Zend/Pdf/Exception/LengthException.php
index 0b17123193e..3fcc318e4b7 100644
--- a/library/Zend/Pdf/Exception/LengthException.php
+++ b/library/Zend/Pdf/Exception/LengthException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LengthException
     extends \LengthException
diff --git a/library/Zend/Pdf/Exception/LogicException.php b/library/Zend/Pdf/Exception/LogicException.php
index 8f50da6760f..75c351f5234 100644
--- a/library/Zend/Pdf/Exception/LogicException.php
+++ b/library/Zend/Pdf/Exception/LogicException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LogicException
     extends \LogicException
diff --git a/library/Zend/Pdf/Exception/NotImplementedException.php b/library/Zend/Pdf/Exception/NotImplementedException.php
index ff5ea1c9a25..305e4cc78a7 100644
--- a/library/Zend/Pdf/Exception/NotImplementedException.php
+++ b/library/Zend/Pdf/Exception/NotImplementedException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NotImplementedException
     extends \Exception
diff --git a/library/Zend/Pdf/Exception/OutOfBoundsException.php b/library/Zend/Pdf/Exception/OutOfBoundsException.php
index 8367718eb14..3b06b8c915d 100644
--- a/library/Zend/Pdf/Exception/OutOfBoundsException.php
+++ b/library/Zend/Pdf/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException
     extends \OutOfBoundsException
diff --git a/library/Zend/Pdf/Exception/RuntimeException.php b/library/Zend/Pdf/Exception/RuntimeException.php
index 2e5fb3c98cb..03c24e9b7f0 100644
--- a/library/Zend/Pdf/Exception/RuntimeException.php
+++ b/library/Zend/Pdf/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -28,8 +26,6 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Pdf/Exception/UnrecognizedFontException.php b/library/Zend/Pdf/Exception/UnrecognizedFontException.php
index d25d001b614..fd49799687e 100644
--- a/library/Zend/Pdf/Exception/UnrecognizedFontException.php
+++ b/library/Zend/Pdf/Exception/UnrecognizedFontException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Exception;
@@ -27,10 +25,8 @@
  * @category  Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnrecognizedFontException
     extends CorruptedFontException
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Pdf/Font.php b/library/Zend/Pdf/Font.php
index b03f955f3b8..e418699187b 100644
--- a/library/Zend/Pdf/Font.php
+++ b/library/Zend/Pdf/Font.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Font
 {
diff --git a/library/Zend/Pdf/Image.php b/library/Zend/Pdf/Image.php
index 4b31bf83357..2b3a49da21d 100644
--- a/library/Zend/Pdf/Image.php
+++ b/library/Zend/Pdf/Image.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 use Zend\Pdf\Exception;
 
diff --git a/library/Zend/Pdf/InternalStructure/NameTree.php b/library/Zend/Pdf/InternalStructure/NameTree.php
index 946fb95c52e..bcc479c3ec0 100644
--- a/library/Zend/Pdf/InternalStructure/NameTree.php
+++ b/library/Zend/Pdf/InternalStructure/NameTree.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalStructure;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NameTree implements \ArrayAccess, \Iterator, \Countable
 {
diff --git a/library/Zend/Pdf/InternalStructure/NavigationTarget.php b/library/Zend/Pdf/InternalStructure/NavigationTarget.php
index f70eed568ce..0864dc871b2 100644
--- a/library/Zend/Pdf/InternalStructure/NavigationTarget.php
+++ b/library/Zend/Pdf/InternalStructure/NavigationTarget.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalStructure;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class NavigationTarget
 {
diff --git a/library/Zend/Pdf/InternalType/AbstractTypeObject.php b/library/Zend/Pdf/InternalType/AbstractTypeObject.php
index 292c2f2e2bc..683895448c2 100644
--- a/library/Zend/Pdf/InternalType/AbstractTypeObject.php
+++ b/library/Zend/Pdf/InternalType/AbstractTypeObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/ArrayObject.php b/library/Zend/Pdf/InternalType/ArrayObject.php
index 0bca2d743e7..1b75181c130 100644
--- a/library/Zend/Pdf/InternalType/ArrayObject.php
+++ b/library/Zend/Pdf/InternalType/ArrayObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/BinaryStringObject.php b/library/Zend/Pdf/InternalType/BinaryStringObject.php
index 32034c28870..f7342e75240 100644
--- a/library/Zend/Pdf/InternalType/BinaryStringObject.php
+++ b/library/Zend/Pdf/InternalType/BinaryStringObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BinaryStringObject extends StringObject
 {
diff --git a/library/Zend/Pdf/InternalType/BooleanObject.php b/library/Zend/Pdf/InternalType/BooleanObject.php
index d8241d90769..eb831236e9a 100644
--- a/library/Zend/Pdf/InternalType/BooleanObject.php
+++ b/library/Zend/Pdf/InternalType/BooleanObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BooleanObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/DictionaryObject.php b/library/Zend/Pdf/InternalType/DictionaryObject.php
index 2fb5c4dfe57..1a021f598a1 100644
--- a/library/Zend/Pdf/InternalType/DictionaryObject.php
+++ b/library/Zend/Pdf/InternalType/DictionaryObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DictionaryObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/IndirectObject.php b/library/Zend/Pdf/InternalType/IndirectObject.php
index a9c9fff0997..e8153540c56 100644
--- a/library/Zend/Pdf/InternalType/IndirectObject.php
+++ b/library/Zend/Pdf/InternalType/IndirectObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IndirectObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/IndirectObjectReference.php b/library/Zend/Pdf/InternalType/IndirectObjectReference.php
index a87af952635..83d68b1cd4e 100644
--- a/library/Zend/Pdf/InternalType/IndirectObjectReference.php
+++ b/library/Zend/Pdf/InternalType/IndirectObjectReference.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IndirectObjectReference extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/IndirectObjectReference/Context.php b/library/Zend/Pdf/InternalType/IndirectObjectReference/Context.php
index 9579a464ad5..f3769f9868b 100644
--- a/library/Zend/Pdf/InternalType/IndirectObjectReference/Context.php
+++ b/library/Zend/Pdf/InternalType/IndirectObjectReference/Context.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\IndirectObjectReference;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Context
 {
diff --git a/library/Zend/Pdf/InternalType/IndirectObjectReference/ReferenceTable.php b/library/Zend/Pdf/InternalType/IndirectObjectReference/ReferenceTable.php
index 68141d042bf..90f8d048b3d 100644
--- a/library/Zend/Pdf/InternalType/IndirectObjectReference/ReferenceTable.php
+++ b/library/Zend/Pdf/InternalType/IndirectObjectReference/ReferenceTable.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\IndirectObjectReference;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReferenceTable
 {
diff --git a/library/Zend/Pdf/InternalType/NameObject.php b/library/Zend/Pdf/InternalType/NameObject.php
index 4ef25012432..2efed459641 100644
--- a/library/Zend/Pdf/InternalType/NameObject.php
+++ b/library/Zend/Pdf/InternalType/NameObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NameObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/NullObject.php b/library/Zend/Pdf/InternalType/NullObject.php
index 0c7b1a5b299..8ffc26faaba 100644
--- a/library/Zend/Pdf/InternalType/NullObject.php
+++ b/library/Zend/Pdf/InternalType/NullObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NullObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/NumericObject.php b/library/Zend/Pdf/InternalType/NumericObject.php
index e522ad5bd07..1d028e4ae3f 100644
--- a/library/Zend/Pdf/InternalType/NumericObject.php
+++ b/library/Zend/Pdf/InternalType/NumericObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NumericObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/StreamContent.php b/library/Zend/Pdf/InternalType/StreamContent.php
index 429ced0cab8..c60c826e98a 100644
--- a/library/Zend/Pdf/InternalType/StreamContent.php
+++ b/library/Zend/Pdf/InternalType/StreamContent.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StreamContent extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter.php b/library/Zend/Pdf/InternalType/StreamFilter.php
index 7977cce27aa..9438ba6db1c 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StreamFilter
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter/Ascii85.php b/library/Zend/Pdf/InternalType/StreamFilter/Ascii85.php
index 2cc52b602ad..ef7281bb2a5 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter/Ascii85.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter/Ascii85.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\StreamFilter;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ascii85 implements StreamFilterInterface
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter/AsciiHex.php b/library/Zend/Pdf/InternalType/StreamFilter/AsciiHex.php
index c1bc3c4c0ce..4cc26d9262c 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter/AsciiHex.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter/AsciiHex.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\StreamFilter;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AsciiHex implements StreamFilterInterface
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter/Compression/AbstractCompression.php b/library/Zend/Pdf/InternalType/StreamFilter/Compression/AbstractCompression.php
index f9bc13fbeec..de7b4a3f607 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter/Compression/AbstractCompression.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter/Compression/AbstractCompression.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\StreamFilter\Compression;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCompression implements Pdf\InternalType\StreamFilter\StreamFilterInterface
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter/Compression/Flate.php b/library/Zend/Pdf/InternalType/StreamFilter/Compression/Flate.php
index e03bf29cd82..2483e07356d 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter/Compression/Flate.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter/Compression/Flate.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\StreamFilter\Compression;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Flate extends AbstractCompression
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter/Compression/Lzw.php b/library/Zend/Pdf/InternalType/StreamFilter/Compression/Lzw.php
index d5add50462c..da0ae89fbdb 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter/Compression/Lzw.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter/Compression/Lzw.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\StreamFilter\Compression;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Lzw extends AbstractCompression
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter/RunLength.php b/library/Zend/Pdf/InternalType/StreamFilter/RunLength.php
index 31cc3f50672..ddb3e2844b0 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter/RunLength.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter/RunLength.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\StreamFilter;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RunLength implements StreamFilterInterface
 {
diff --git a/library/Zend/Pdf/InternalType/StreamFilter/StreamFilterInterface.php b/library/Zend/Pdf/InternalType/StreamFilter/StreamFilterInterface.php
index 2bc75dba452..a20531448e3 100644
--- a/library/Zend/Pdf/InternalType/StreamFilter/StreamFilterInterface.php
+++ b/library/Zend/Pdf/InternalType/StreamFilter/StreamFilterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType\StreamFilter;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StreamFilterInterface
 {
diff --git a/library/Zend/Pdf/InternalType/StreamObject.php b/library/Zend/Pdf/InternalType/StreamObject.php
index c247f323eb0..7863d5388a5 100644
--- a/library/Zend/Pdf/InternalType/StreamObject.php
+++ b/library/Zend/Pdf/InternalType/StreamObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StreamObject extends IndirectObject
 {
diff --git a/library/Zend/Pdf/InternalType/StringObject.php b/library/Zend/Pdf/InternalType/StringObject.php
index cd3cf2d930c..d95981d581f 100644
--- a/library/Zend/Pdf/InternalType/StringObject.php
+++ b/library/Zend/Pdf/InternalType/StringObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\InternalType;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StringObject extends AbstractTypeObject
 {
diff --git a/library/Zend/Pdf/ObjectFactory.php b/library/Zend/Pdf/ObjectFactory.php
index 636d14451ce..bdc2ca4b1b4 100644
--- a/library/Zend/Pdf/ObjectFactory.php
+++ b/library/Zend/Pdf/ObjectFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ObjectFactory
 {
diff --git a/library/Zend/Pdf/ObjectFactory/UpdateInfoContainer.php b/library/Zend/Pdf/ObjectFactory/UpdateInfoContainer.php
index 23502383319..b9d363a2f70 100644
--- a/library/Zend/Pdf/ObjectFactory/UpdateInfoContainer.php
+++ b/library/Zend/Pdf/ObjectFactory/UpdateInfoContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\ObjectFactory;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UpdateInfoContainer
 {
diff --git a/library/Zend/Pdf/Outline/AbstractOutline.php b/library/Zend/Pdf/Outline/AbstractOutline.php
index 97b27085870..21434a3e32a 100644
--- a/library/Zend/Pdf/Outline/AbstractOutline.php
+++ b/library/Zend/Pdf/Outline/AbstractOutline.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Outline
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Outline;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Outline
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractOutline implements \RecursiveIterator, \Countable
 {
diff --git a/library/Zend/Pdf/Outline/Created.php b/library/Zend/Pdf/Outline/Created.php
index 66b85f5738c..29ce5336efb 100644
--- a/library/Zend/Pdf/Outline/Created.php
+++ b/library/Zend/Pdf/Outline/Created.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Outline
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Outline;
@@ -35,8 +33,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Outline
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Created extends AbstractOutline
 {
diff --git a/library/Zend/Pdf/Outline/Loaded.php b/library/Zend/Pdf/Outline/Loaded.php
index 62d7dd20616..6e1412aba1e 100644
--- a/library/Zend/Pdf/Outline/Loaded.php
+++ b/library/Zend/Pdf/Outline/Loaded.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Outline
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Outline;
@@ -36,8 +34,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Outline
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Loaded extends AbstractOutline
 {
diff --git a/library/Zend/Pdf/Page.php b/library/Zend/Pdf/Page.php
index cfd00211371..cda5a4ba01b 100644
--- a/library/Zend/Pdf/Page.php
+++ b/library/Zend/Pdf/Page.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_PDF
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf;
@@ -24,8 +22,6 @@
  * PDF Page
  *
  * @package    Zend_PDF
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 use Zend\Pdf\Exception;
diff --git a/library/Zend/Pdf/PdfDocument.php b/library/Zend/Pdf/PdfDocument.php
index dc822d6e06e..61baef9eb15 100644
--- a/library/Zend/Pdf/PdfDocument.php
+++ b/library/Zend/Pdf/PdfDocument.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_PDF
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf;
@@ -35,8 +33,6 @@
  *
  * @category   Zend
  * @package    Zend_PDF
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PdfDocument
 {
diff --git a/library/Zend/Pdf/PdfParser/DataParser.php b/library/Zend/Pdf/PdfParser/DataParser.php
index 15446d02667..4e2d552957a 100644
--- a/library/Zend/Pdf/PdfParser/DataParser.php
+++ b/library/Zend/Pdf/PdfParser/DataParser.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\PdfParser;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DataParser
 {
diff --git a/library/Zend/Pdf/PdfParser/StructureParser.php b/library/Zend/Pdf/PdfParser/StructureParser.php
index 11aba463da1..1258d2706de 100644
--- a/library/Zend/Pdf/PdfParser/StructureParser.php
+++ b/library/Zend/Pdf/PdfParser/StructureParser.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\PdfParser;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StructureParser
 {
diff --git a/library/Zend/Pdf/Resource/AbstractResource.php b/library/Zend/Pdf/Resource/AbstractResource.php
index 8028451147b..59d03345004 100644
--- a/library/Zend/Pdf/Resource/AbstractResource.php
+++ b/library/Zend/Pdf/Resource/AbstractResource.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractResource
 {
diff --git a/library/Zend/Pdf/Resource/Extractor.php b/library/Zend/Pdf/Resource/Extractor.php
index 80e591041c5..3a38884b6c0 100644
--- a/library/Zend/Pdf/Resource/Extractor.php
+++ b/library/Zend/Pdf/Resource/Extractor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource;
@@ -38,8 +36,6 @@
  * must not be shared between target documents.
  *
  * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Extractor
 {
diff --git a/library/Zend/Pdf/Resource/Font/AbstractFont.php b/library/Zend/Pdf/Resource/Font/AbstractFont.php
index 3a702e67d83..61e0d69cdc5 100644
--- a/library/Zend/Pdf/Resource/Font/AbstractFont.php
+++ b/library/Zend/Pdf/Resource/Font/AbstractFont.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font;
@@ -37,8 +35,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFont extends Resource\AbstractResource
 {
diff --git a/library/Zend/Pdf/Resource/Font/CidFont/AbstractCidFont.php b/library/Zend/Pdf/Resource/Font/CidFont/AbstractCidFont.php
index 17b2566efbe..101dc921586 100644
--- a/library/Zend/Pdf/Resource/Font/CidFont/AbstractCidFont.php
+++ b/library/Zend/Pdf/Resource/Font/CidFont/AbstractCidFont.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\CidFont;
@@ -45,8 +43,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCidFont extends FontResource\AbstractFont
 {
diff --git a/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php b/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php
index d0d85400b32..0afc6e4398f 100644
--- a/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php
+++ b/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\CidFont;
@@ -37,8 +35,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TrueType extends AbstractCidFont
 {
diff --git a/library/Zend/Pdf/Resource/Font/Extracted.php b/library/Zend/Pdf/Resource/Font/Extracted.php
index 19300f44a4e..0bbc5c86894 100644
--- a/library/Zend/Pdf/Resource/Font/Extracted.php
+++ b/library/Zend/Pdf/Resource/Font/Extracted.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Extracted extends AbstractFont
 {
diff --git a/library/Zend/Pdf/Resource/Font/FontDescriptor.php b/library/Zend/Pdf/Resource/Font/FontDescriptor.php
index 92c4e0859d3..fa01b133108 100644
--- a/library/Zend/Pdf/Resource/Font/FontDescriptor.php
+++ b/library/Zend/Pdf/Resource/Font/FontDescriptor.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font;
@@ -36,8 +34,6 @@
  *
  * @subpackage Zend_PDF_Fonts
  * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FontDescriptor
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/AbstractSimple.php b/library/Zend/Pdf/Resource/Font/Simple/AbstractSimple.php
index 08df9cf340f..f759dc82f63 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/AbstractSimple.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/AbstractSimple.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple;
@@ -51,8 +49,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractSimple extends FontResource\AbstractFont
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Parsed/AbstractParsed.php b/library/Zend/Pdf/Resource/Font/Simple/Parsed/AbstractParsed.php
index 434f32e5c50..0ef9e86dc44 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Parsed/AbstractParsed.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Parsed/AbstractParsed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Parsed;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractParsed extends \Zend\Pdf\Resource\Font\Simple\AbstractSimple
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php b/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php
index e81847a7a78..68d15310460 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Parsed;
@@ -33,8 +31,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TrueType extends AbstractParsed
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/AbstractStandard.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/AbstractStandard.php
index c50f3bddad9..0dcac7641a4 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/AbstractStandard.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/AbstractStandard.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -54,8 +52,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractStandard extends \Zend\Pdf\Resource\Font\Simple\AbstractSimple
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php
index d2a19bc2f9e..382c574a65b 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Courier extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php
index cfcf6487753..acc8b86a5af 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CourierBold extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php
index c85e0c88798..eeaebd76e8d 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CourierBoldOblique extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php
index 8629a6df801..afb2ecd9724 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CourierOblique extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php
index a25c3a33a9c..112c9fc55c4 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Helvetica extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php
index fd4fe4cfc16..5574921f521 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelveticaBold extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php
index bce27c9798b..8ce2a2bab9b 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelveticaBoldOblique extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php
index 5e29a866702..a5201382d53 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelveticaOblique extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php
index 02696902833..e98b57bb14d 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Symbol extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php
index ce49fa8fac3..85b1b6f5795 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TimesBold extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php
index 91e5a16c0d7..f03329bf5f3 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TimesBoldItalic extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php
index 666e827e634..16bf992031c 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TimesItalic extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php
index 72291b31411..cd58ee3d406 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TimesRoman extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php
index d49e616d360..0f1fac02baa 100644
--- a/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php
+++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font\Simple\Standard;
@@ -38,8 +36,6 @@
  *
  * @subpackage Zend_PDF_Fonts
  * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZapfDingbats extends AbstractStandard
 {
diff --git a/library/Zend/Pdf/Resource/Font/Type0.php b/library/Zend/Pdf/Resource/Font/Type0.php
index 7fa92c6330f..bc1dbd8953b 100644
--- a/library/Zend/Pdf/Resource/Font/Type0.php
+++ b/library/Zend/Pdf/Resource/Font/Type0.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Font;
@@ -52,8 +50,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Fonts
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Type0 extends AbstractFont
 {
diff --git a/library/Zend/Pdf/Resource/Image/AbstractImage.php b/library/Zend/Pdf/Resource/Image/AbstractImage.php
index 5b6db83b8d7..14dad20c0b2 100644
--- a/library/Zend/Pdf/Resource/Image/AbstractImage.php
+++ b/library/Zend/Pdf/Resource/Image/AbstractImage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Image;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractImage extends Resource\AbstractResource
 {
diff --git a/library/Zend/Pdf/Resource/Image/ImageFactory.php b/library/Zend/Pdf/Resource/Image/ImageFactory.php
index b49fa346e3a..88e7344929c 100644
--- a/library/Zend/Pdf/Resource/Image/ImageFactory.php
+++ b/library/Zend/Pdf/Resource/Image/ImageFactory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Image;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @todo       Use Zend_Mime not file extension for type determination.
  */
 class ImageFactory
diff --git a/library/Zend/Pdf/Resource/Image/Jpeg.php b/library/Zend/Pdf/Resource/Image/Jpeg.php
index 503b1f61c90..1dbddda8a75 100644
--- a/library/Zend/Pdf/Resource/Image/Jpeg.php
+++ b/library/Zend/Pdf/Resource/Image/Jpeg.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Image;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Jpeg extends AbstractImage
 {
diff --git a/library/Zend/Pdf/Resource/Image/Png.php b/library/Zend/Pdf/Resource/Image/Png.php
index 977a904f71c..3cc62fc1fe1 100644
--- a/library/Zend/Pdf/Resource/Image/Png.php
+++ b/library/Zend/Pdf/Resource/Image/Png.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Image;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Png extends AbstractImage
 {
diff --git a/library/Zend/Pdf/Resource/Image/Tiff.php b/library/Zend/Pdf/Resource/Image/Tiff.php
index 6e23183fa96..9bc1e707a02 100644
--- a/library/Zend/Pdf/Resource/Image/Tiff.php
+++ b/library/Zend/Pdf/Resource/Image/Tiff.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Resource\Image;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Image
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Tiff extends AbstractImage
 {
diff --git a/library/Zend/Pdf/Style.php b/library/Zend/Pdf/Style.php
index 36d30087dae..3cb69a4c9a7 100644
--- a/library/Zend/Pdf/Style.php
+++ b/library/Zend/Pdf/Style.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_PDF
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf;
@@ -27,8 +25,6 @@
  * It's used by \Zend\Pdf\Page class for draw operations.
  *
  * @package    Zend_PDF
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Style
 {
diff --git a/library/Zend/Pdf/Trailer/AbstractTrailer.php b/library/Zend/Pdf/Trailer/AbstractTrailer.php
index 4530f429687..ebdcba51853 100644
--- a/library/Zend/Pdf/Trailer/AbstractTrailer.php
+++ b/library/Zend/Pdf/Trailer/AbstractTrailer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Trailer;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractTrailer
 {
diff --git a/library/Zend/Pdf/Trailer/Generated.php b/library/Zend/Pdf/Trailer/Generated.php
index 99e8008c835..95ad13a3670 100644
--- a/library/Zend/Pdf/Trailer/Generated.php
+++ b/library/Zend/Pdf/Trailer/Generated.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Trailer;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Generated extends AbstractTrailer
 {
diff --git a/library/Zend/Pdf/Trailer/Parsed.php b/library/Zend/Pdf/Trailer/Parsed.php
index 58d72738125..45f3258960d 100644
--- a/library/Zend/Pdf/Trailer/Parsed.php
+++ b/library/Zend/Pdf/Trailer/Parsed.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Trailer;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Parsed extends AbstractTrailer
 {
diff --git a/library/Zend/Pdf/Util/RecursivelyIteratableObjectsContainer.php b/library/Zend/Pdf/Util/RecursivelyIteratableObjectsContainer.php
index cc6baef04dd..e98a1b15d87 100644
--- a/library/Zend/Pdf/Util/RecursivelyIteratableObjectsContainer.php
+++ b/library/Zend/Pdf/Util/RecursivelyIteratableObjectsContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Util
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Pdf\Util;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_PDF
  * @subpackage Zend_PDF_Util
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RecursivelyIteratableObjectsContainer implements \RecursiveIterator, \Countable
 {
diff --git a/library/Zend/ProgressBar/Adapter/AbstractAdapter.php b/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
index a39e6fda127..da60fb9ce30 100644
--- a/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
+++ b/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Adapter;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter
 {
diff --git a/library/Zend/ProgressBar/Adapter/Console.php b/library/Zend/ProgressBar/Adapter/Console.php
index 04e911ea6e1..c44e3d3c9dc 100644
--- a/library/Zend/ProgressBar/Adapter/Console.php
+++ b/library/Zend/ProgressBar/Adapter/Console.php
@@ -12,8 +12,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Adapter;
@@ -26,8 +24,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Console extends AbstractAdapter
 {
diff --git a/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php b/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
index ed10605f26c..8850ed48094 100644
--- a/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Adapter\Exception;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
     extends ProgressBarException
diff --git a/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php b/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
index c0d3501bdd5..8a67979f832 100644
--- a/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Adapter\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php b/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
index f3f2a8c59a7..0823742b55c 100644
--- a/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Adapter\Exception;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements 
     ExceptionInterface
diff --git a/library/Zend/ProgressBar/Adapter/JsPull.php b/library/Zend/ProgressBar/Adapter/JsPull.php
index ab80eca0ed7..77e59e9696d 100644
--- a/library/Zend/ProgressBar/Adapter/JsPull.php
+++ b/library/Zend/ProgressBar/Adapter/JsPull.php
@@ -12,8 +12,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Adapter;
@@ -26,8 +24,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class JsPull extends AbstractAdapter
 {
diff --git a/library/Zend/ProgressBar/Adapter/JsPush.php b/library/Zend/ProgressBar/Adapter/JsPush.php
index c6e44715b03..38f077f5929 100644
--- a/library/Zend/ProgressBar/Adapter/JsPush.php
+++ b/library/Zend/ProgressBar/Adapter/JsPush.php
@@ -12,8 +12,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Adapter;
@@ -26,8 +24,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class JsPush extends AbstractAdapter
 {
diff --git a/library/Zend/ProgressBar/Exception/ExceptionInterface.php b/library/Zend/ProgressBar/Exception/ExceptionInterface.php
index b3f47c9ff9d..0f5263540d9 100644
--- a/library/Zend/ProgressBar/Exception/ExceptionInterface.php
+++ b/library/Zend/ProgressBar/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Exception;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/ProgressBar/Exception/InvalidArgumentException.php b/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
index 086c7cc37dd..0ed889e5ce6 100644
--- a/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
+++ b/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Exception;
@@ -26,10 +24,8 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/ProgressBar/Exception/OutOfRangeException.php b/library/Zend/ProgressBar/Exception/OutOfRangeException.php
index 251d7b3b51f..96038a22a06 100644
--- a/library/Zend/ProgressBar/Exception/OutOfRangeException.php
+++ b/library/Zend/ProgressBar/Exception/OutOfRangeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException
     extends \OutOfRangeException
diff --git a/library/Zend/ProgressBar/Exception/RuntimeException.php b/library/Zend/ProgressBar/Exception/RuntimeException.php
index 6eac858f27a..cc6d71bec77 100644
--- a/library/Zend/ProgressBar/Exception/RuntimeException.php
+++ b/library/Zend/ProgressBar/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/ProgressBar/ProgressBar.php b/library/Zend/ProgressBar/ProgressBar.php
index f65c1f87f47..625ed9a92e6 100644
--- a/library/Zend/ProgressBar/ProgressBar.php
+++ b/library/Zend/ProgressBar/ProgressBar.php
@@ -12,8 +12,6 @@
  *
  * @category   Zend
  * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ProgressBar;
@@ -26,8 +24,6 @@
  *
  * @category  Zend
  * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ProgressBar
 {
diff --git a/library/Zend/Queue/Adapter.php b/library/Zend/Queue/Adapter.php
index cafa14d2d4d..1c5f0f54222 100644
--- a/library/Zend/Queue/Adapter.php
+++ b/library/Zend/Queue/Adapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Adapter
 {
diff --git a/library/Zend/Queue/Adapter/AbstractAdapter.php b/library/Zend/Queue/Adapter/AbstractAdapter.php
index b5553b2ce77..1bdfbf5da3e 100644
--- a/library/Zend/Queue/Adapter/AbstractAdapter.php
+++ b/library/Zend/Queue/Adapter/AbstractAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements Adapter
 {
diff --git a/library/Zend/Queue/Adapter/Activemq.php b/library/Zend/Queue/Adapter/Activemq.php
index 092e747b39a..279cfe8565f 100644
--- a/library/Zend/Queue/Adapter/Activemq.php
+++ b/library/Zend/Queue/Adapter/Activemq.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Activemq extends AbstractAdapter
 {
diff --git a/library/Zend/Queue/Adapter/ArrayAdapter.php b/library/Zend/Queue/Adapter/ArrayAdapter.php
index f675b2e9dce..8c6bdea1e42 100644
--- a/library/Zend/Queue/Adapter/ArrayAdapter.php
+++ b/library/Zend/Queue/Adapter/ArrayAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayAdapter extends AbstractAdapter
 {
diff --git a/library/Zend/Queue/Adapter/Db.php b/library/Zend/Queue/Adapter/Db.php
index a903e6ad1b5..156925d5fed 100644
--- a/library/Zend/Queue/Adapter/Db.php
+++ b/library/Zend/Queue/Adapter/Db.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Db extends AbstractAdapter
 {
diff --git a/library/Zend/Queue/Adapter/Db/Message.php b/library/Zend/Queue/Adapter/Db/Message.php
index 66ba4d03daf..f3d643b70a6 100644
--- a/library/Zend/Queue/Adapter/Db/Message.php
+++ b/library/Zend/Queue/Adapter/Db/Message.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter\Db;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Message extends \Zend\Db\Table\AbstractTable
 {
diff --git a/library/Zend/Queue/Adapter/Db/Queue.php b/library/Zend/Queue/Adapter/Db/Queue.php
index f37ace7bf89..bce5137faf2 100644
--- a/library/Zend/Queue/Adapter/Db/Queue.php
+++ b/library/Zend/Queue/Adapter/Db/Queue.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter\Db;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Queue extends \Zend\Db\Table\AbstractTable
 {
diff --git a/library/Zend/Queue/Adapter/Memcacheq.php b/library/Zend/Queue/Adapter/Memcacheq.php
index e462ca42dd0..a1d77064dda 100644
--- a/library/Zend/Queue/Adapter/Memcacheq.php
+++ b/library/Zend/Queue/Adapter/Memcacheq.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Memcacheq extends AbstractAdapter
 {
diff --git a/library/Zend/Queue/Adapter/Null.php b/library/Zend/Queue/Adapter/Null.php
index 74b5ee0d7b9..2d152d9b680 100644
--- a/library/Zend/Queue/Adapter/Null.php
+++ b/library/Zend/Queue/Adapter/Null.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Null extends AbstractAdapter
 {
diff --git a/library/Zend/Queue/Adapter/PlatformJobQueue.php b/library/Zend/Queue/Adapter/PlatformJobQueue.php
index 98dff92db47..a2b60945c16 100644
--- a/library/Zend/Queue/Adapter/PlatformJobQueue.php
+++ b/library/Zend/Queue/Adapter/PlatformJobQueue.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Adapter;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlatformJobQueue extends AbstractAdapter
 {
diff --git a/library/Zend/Queue/Exception/ConnectionException.php b/library/Zend/Queue/Exception/ConnectionException.php
index 4b0f5b9c97a..55d01117122 100644
--- a/library/Zend/Queue/Exception/ConnectionException.php
+++ b/library/Zend/Queue/Exception/ConnectionException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ConnectionException extends RuntimeException
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/DomainException.php b/library/Zend/Queue/Exception/DomainException.php
index 63cd1eebf2e..cb851f46535 100644
--- a/library/Zend/Queue/Exception/DomainException.php
+++ b/library/Zend/Queue/Exception/DomainException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException 
     extends \DomainException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/ExceptionInterface.php b/library/Zend/Queue/Exception/ExceptionInterface.php
index 40be612a7ab..2d779f7913c 100644
--- a/library/Zend/Queue/Exception/ExceptionInterface.php
+++ b/library/Zend/Queue/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Queue/Exception/ExtensionNotLoadedException.php b/library/Zend/Queue/Exception/ExtensionNotLoadedException.php
index c3b1bed43d6..3b16e67960c 100644
--- a/library/Zend/Queue/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Queue/Exception/ExtensionNotLoadedException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExtensionNotLoadedException extends RuntimeException
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/InvalidArgumentException.php b/library/Zend/Queue/Exception/InvalidArgumentException.php
index 5480feccc05..848d4b32ac6 100644
--- a/library/Zend/Queue/Exception/InvalidArgumentException.php
+++ b/library/Zend/Queue/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException 
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/LogicException.php b/library/Zend/Queue/Exception/LogicException.php
index 3a2c2be7079..a77f15612e0 100644
--- a/library/Zend/Queue/Exception/LogicException.php
+++ b/library/Zend/Queue/Exception/LogicException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LogicException
     extends \LogicException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/QueueNotFoundException.php b/library/Zend/Queue/Exception/QueueNotFoundException.php
index db61b56922f..527931864d3 100644
--- a/library/Zend/Queue/Exception/QueueNotFoundException.php
+++ b/library/Zend/Queue/Exception/QueueNotFoundException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueueNotFoundException extends RuntimeException
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/RangeException.php b/library/Zend/Queue/Exception/RangeException.php
index 55889bd522c..e5b72268f33 100644
--- a/library/Zend/Queue/Exception/RangeException.php
+++ b/library/Zend/Queue/Exception/RangeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RangeException 
     extends \RangeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/RuntimeException.php b/library/Zend/Queue/Exception/RuntimeException.php
index 55c7fd1cd43..5dd4069a368 100644
--- a/library/Zend/Queue/Exception/RuntimeException.php
+++ b/library/Zend/Queue/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/UnexpectedValueException.php b/library/Zend/Queue/Exception/UnexpectedValueException.php
index 5626970d050..39f836e15be 100644
--- a/library/Zend/Queue/Exception/UnexpectedValueException.php
+++ b/library/Zend/Queue/Exception/UnexpectedValueException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException
     extends \UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Exception/UnsupportedMethodCallException.php b/library/Zend/Queue/Exception/UnsupportedMethodCallException.php
index ad1386b33d2..d63134bf0b0 100644
--- a/library/Zend/Queue/Exception/UnsupportedMethodCallException.php
+++ b/library/Zend/Queue/Exception/UnsupportedMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnsupportedMethodCallException
     extends \BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Queue/Message.php b/library/Zend/Queue/Message.php
index aaee3ee6c67..b7fb8ea9cba 100644
--- a/library/Zend/Queue/Message.php
+++ b/library/Zend/Queue/Message.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Message
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Message
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Message
 {
diff --git a/library/Zend/Queue/Message/MessageIterator.php b/library/Zend/Queue/Message/MessageIterator.php
index 964f08e588d..9eeb78bea41 100644
--- a/library/Zend/Queue/Message/MessageIterator.php
+++ b/library/Zend/Queue/Message/MessageIterator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Message
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Message;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Message
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MessageIterator implements Iterator, Countable
 {
diff --git a/library/Zend/Queue/Message/PlatformJob.php b/library/Zend/Queue/Message/PlatformJob.php
index 9b2e8bd1f7a..11dcc9ed461 100644
--- a/library/Zend/Queue/Message/PlatformJob.php
+++ b/library/Zend/Queue/Message/PlatformJob.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Message
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Message;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Message
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PlatformJob extends Message
 {
diff --git a/library/Zend/Queue/Queue.php b/library/Zend/Queue/Queue.php
index 94b6423dd99..caaa6fa2631 100644
--- a/library/Zend/Queue/Queue.php
+++ b/library/Zend/Queue/Queue.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Queue implements Countable
 {
diff --git a/library/Zend/Queue/Stomp/Client.php b/library/Zend/Queue/Stomp/Client.php
index 11cbe852b9a..f5e8506cb69 100644
--- a/library/Zend/Queue/Stomp/Client.php
+++ b/library/Zend/Queue/Stomp/Client.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Stomp;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Client
 {
diff --git a/library/Zend/Queue/Stomp/Connection.php b/library/Zend/Queue/Stomp/Connection.php
old mode 100755
new mode 100644
index 129cd3571d9..1ee148af36a
--- a/library/Zend/Queue/Stomp/Connection.php
+++ b/library/Zend/Queue/Stomp/Connection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Stomp;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Connection implements StompConnection
 {
diff --git a/library/Zend/Queue/Stomp/Frame.php b/library/Zend/Queue/Stomp/Frame.php
index 720c13bfcfc..3ee4c455b7f 100644
--- a/library/Zend/Queue/Stomp/Frame.php
+++ b/library/Zend/Queue/Stomp/Frame.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Stomp;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Frame implements StompFrame
 {
diff --git a/library/Zend/Queue/Stomp/StompConnection.php b/library/Zend/Queue/Stomp/StompConnection.php
index 276b59e3bde..3e43e56e4e4 100644
--- a/library/Zend/Queue/Stomp/StompConnection.php
+++ b/library/Zend/Queue/Stomp/StompConnection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Stomp;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StompConnection
 {
diff --git a/library/Zend/Queue/Stomp/StompFrame.php b/library/Zend/Queue/Stomp/StompFrame.php
index 78cf5a7f6e1..3f5c01d30e8 100644
--- a/library/Zend/Queue/Stomp/StompFrame.php
+++ b/library/Zend/Queue/Stomp/StompFrame.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Queue\Stomp;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StompFrame
 {
diff --git a/library/Zend/Registry.php b/library/Zend/Registry.php
index 7ce68d9026b..6b0f183d698 100644
--- a/library/Zend/Registry.php
+++ b/library/Zend/Registry.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Registry
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Registry
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Registry extends ArrayObject
 {
diff --git a/library/Zend/Rest/Client/Exception/ExceptionInterface.php b/library/Zend/Rest/Client/Exception/ExceptionInterface.php
index f86596b5f67..1b4cc924754 100644
--- a/library/Zend/Rest/Client/Exception/ExceptionInterface.php
+++ b/library/Zend/Rest/Client/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Rest\Client\Exception;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Rest/Client/Exception/ResultException.php b/library/Zend/Rest/Client/Exception/ResultException.php
index 4d9bd70f2b3..b57a3edbae7 100644
--- a/library/Zend/Rest/Client/Exception/ResultException.php
+++ b/library/Zend/Rest/Client/Exception/ResultException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Rest\Client\Exception;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ResultException 
     extends \Exception
diff --git a/library/Zend/Rest/Client/Exception/UnexpectedValueException.php b/library/Zend/Rest/Client/Exception/UnexpectedValueException.php
index 2297ee48937..f4142c00934 100644
--- a/library/Zend/Rest/Client/Exception/UnexpectedValueException.php
+++ b/library/Zend/Rest/Client/Exception/UnexpectedValueException.php
@@ -7,4 +7,4 @@
 class UnexpectedValueException
     extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Rest/Client/RestClient.php b/library/Zend/Rest/Client/RestClient.php
index 21b3f5b868b..41c9727c536 100644
--- a/library/Zend/Rest/Client/RestClient.php
+++ b/library/Zend/Rest/Client/RestClient.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Rest\Client;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RestClient extends \Zend\Service\AbstractService
 {
diff --git a/library/Zend/Rest/Client/Result.php b/library/Zend/Rest/Client/Result.php
index cad86a84ff1..2783dc2798c 100644
--- a/library/Zend/Rest/Client/Result.php
+++ b/library/Zend/Rest/Client/Result.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Rest\Client;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Result implements \IteratorAggregate 
 {
diff --git a/library/Zend/Rest/Exception/ExceptionInterface.php b/library/Zend/Rest/Exception/ExceptionInterface.php
index 95833812e04..81a20b40c46 100644
--- a/library/Zend/Rest/Exception/ExceptionInterface.php
+++ b/library/Zend/Rest/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Rest\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Rest/Exception/UnexpectedValueException.php b/library/Zend/Rest/Exception/UnexpectedValueException.php
index 2eb1a54266b..4da72488f76 100644
--- a/library/Zend/Rest/Exception/UnexpectedValueException.php
+++ b/library/Zend/Rest/Exception/UnexpectedValueException.php
@@ -5,4 +5,4 @@
 class UnexpectedValueException
     extends \UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Search/Exception/ExceptionInterface.php b/library/Zend/Search/Exception/ExceptionInterface.php
index 13923b14a13..60639e0672d 100644
--- a/library/Zend/Search/Exception/ExceptionInterface.php
+++ b/library/Zend/Search/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Search/Lucene/AbstractFSM.php b/library/Zend/Search/Lucene/AbstractFSM.php
index baf6a19e833..3c4431304e2 100644
--- a/library/Zend/Search/Lucene/AbstractFSM.php
+++ b/library/Zend/Search/Lucene/AbstractFSM.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFSM
 {
diff --git a/library/Zend/Search/Lucene/AbstractPriorityQueue.php b/library/Zend/Search/Lucene/AbstractPriorityQueue.php
index 9b1f52379e1..6de7ab3d8fb 100644
--- a/library/Zend/Search/Lucene/AbstractPriorityQueue.php
+++ b/library/Zend/Search/Lucene/AbstractPriorityQueue.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPriorityQueue
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/AbstractAnalyzer.php b/library/Zend/Search/Lucene/Analysis/Analyzer/AbstractAnalyzer.php
index f42237f6c06..2bb0d718a56 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/AbstractAnalyzer.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/AbstractAnalyzer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAnalyzer implements LuceneAnalyzer
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Analyzer.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Analyzer.php
index 30687cdc13c..948ced36742 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Analyzer.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Analyzer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Analyzer
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/AnalyzerInterface.php b/library/Zend/Search/Lucene/Analysis/Analyzer/AnalyzerInterface.php
index f042351284a..2bf7df544d1 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/AnalyzerInterface.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/AnalyzerInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AnalyzerInterface
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/AbstractCommon.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/AbstractCommon.php
index c87b04c7928..6bb803cc3bb 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/AbstractCommon.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/AbstractCommon.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCommon extends Analysis\Analyzer\AbstractAnalyzer
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
index bdc3f796552..bc9c14545ce 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Text extends AbstractCommon
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
index cbcc23a0083..0a2a34a28e0 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common\Text;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CaseInsensitive extends Common\Text
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
index b7beab5b629..a15c568a7fd 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TextNum extends AbstractCommon
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
index 876a81d614a..628a4ef5e01 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common\TextNum;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CaseInsensitive extends Common\TextNum
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
index ae05e6475f3..ff988e7c713 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Utf8 extends AbstractCommon
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
index df04d9f248e..87497776604 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common\Utf8;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CaseInsensitive extends Common\Utf8
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
index bd575380509..bb3f5af58cb 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Utf8Num extends AbstractCommon
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
index 2632436eea5..c1df0d9872e 100644
--- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
+++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\Analyzer\Common\Utf8Num;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CaseInsensitive extends Common\Utf8Num
 {
diff --git a/library/Zend/Search/Lucene/Analysis/Token.php b/library/Zend/Search/Lucene/Analysis/Token.php
index c83936bacf1..96d8f32279f 100644
--- a/library/Zend/Search/Lucene/Analysis/Token.php
+++ b/library/Zend/Search/Lucene/Analysis/Token.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Token
 {
diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
index 564eb935c3e..f3f542847e7 100644
--- a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
+++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LowerCase implements TokenFilterInterface
 {
diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
index 45b7c0d0056..ee24d4f91a4 100644
--- a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
+++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LowerCaseUtf8 implements TokenFilterInterface
 {
diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
index eb196ea9011..01de864b3ff 100644
--- a/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
+++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ShortWords implements TokenFilterInterface
 {
diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
index 0bf7192eb52..154bec4a1cc 100644
--- a/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
+++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StopWords implements TokenFilterInterface
 {
diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/TokenFilterInterface.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/TokenFilterInterface.php
index d42ffb9e500..b868b26fc17 100644
--- a/library/Zend/Search/Lucene/Analysis/TokenFilter/TokenFilterInterface.php
+++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/TokenFilterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TokenFilterInterface
 {
diff --git a/library/Zend/Search/Lucene/Document.php b/library/Zend/Search/Lucene/Document.php
index 1911c832f7b..4043d50087b 100644
--- a/library/Zend/Search/Lucene/Document.php
+++ b/library/Zend/Search/Lucene/Document.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Document
 {
diff --git a/library/Zend/Search/Lucene/Document/AbstractOpenXML.php b/library/Zend/Search/Lucene/Document/AbstractOpenXML.php
index 4f280750f20..5484e5de100 100644
--- a/library/Zend/Search/Lucene/Document/AbstractOpenXML.php
+++ b/library/Zend/Search/Lucene/Document/AbstractOpenXML.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Document;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractOpenXML extends Document
 {
diff --git a/library/Zend/Search/Lucene/Document/Docx.php b/library/Zend/Search/Lucene/Document/Docx.php
index 1dc7518963c..db37c88b704 100644
--- a/library/Zend/Search/Lucene/Document/Docx.php
+++ b/library/Zend/Search/Lucene/Document/Docx.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Document;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Docx extends AbstractOpenXML {
     /**
diff --git a/library/Zend/Search/Lucene/Document/Exception/ExceptionInterface.php b/library/Zend/Search/Lucene/Document/Exception/ExceptionInterface.php
index 6b2fa3df7a0..2f709b4b9df 100644
--- a/library/Zend/Search/Lucene/Document/Exception/ExceptionInterface.php
+++ b/library/Zend/Search/Lucene/Document/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Document\Exception;
diff --git a/library/Zend/Search/Lucene/Document/Field.php b/library/Zend/Search/Lucene/Document/Field.php
index 6b37377b81f..07c34ad0c97 100644
--- a/library/Zend/Search/Lucene/Document/Field.php
+++ b/library/Zend/Search/Lucene/Document/Field.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Document;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Field
 {
diff --git a/library/Zend/Search/Lucene/Document/HTML.php b/library/Zend/Search/Lucene/Document/HTML.php
index 1864094ff67..dfd14dfb368 100644
--- a/library/Zend/Search/Lucene/Document/HTML.php
+++ b/library/Zend/Search/Lucene/Document/HTML.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Document;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HTML extends Document
 {
diff --git a/library/Zend/Search/Lucene/Document/Pptx.php b/library/Zend/Search/Lucene/Document/Pptx.php
index ac49e428939..fd6ef47188c 100644
--- a/library/Zend/Search/Lucene/Document/Pptx.php
+++ b/library/Zend/Search/Lucene/Document/Pptx.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Document;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Pptx extends AbstractOpenXML
 {
diff --git a/library/Zend/Search/Lucene/Document/Xlsx.php b/library/Zend/Search/Lucene/Document/Xlsx.php
index 948d6d4f5b1..6063f73796a 100644
--- a/library/Zend/Search/Lucene/Document/Xlsx.php
+++ b/library/Zend/Search/Lucene/Document/Xlsx.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Document;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Xlsx extends AbstractOpenXML
 {
diff --git a/library/Zend/Search/Lucene/Exception/ExceptionInterface.php b/library/Zend/Search/Lucene/Exception/ExceptionInterface.php
index 2b89a4a17bf..6b73dd3aeb5 100644
--- a/library/Zend/Search/Lucene/Exception/ExceptionInterface.php
+++ b/library/Zend/Search/Lucene/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends \Zend\Search\Exception\ExceptionInterface
 {}
diff --git a/library/Zend/Search/Lucene/FSMAction.php b/library/Zend/Search/Lucene/FSMAction.php
index ca65e5ecb40..fc1698fc2a7 100644
--- a/library/Zend/Search/Lucene/FSMAction.php
+++ b/library/Zend/Search/Lucene/FSMAction.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FSMAction
 {
diff --git a/library/Zend/Search/Lucene/Index.php b/library/Zend/Search/Lucene/Index.php
index 103dec36567..7b874366132 100644
--- a/library/Zend/Search/Lucene/Index.php
+++ b/library/Zend/Search/Lucene/Index.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -30,8 +28,6 @@
 /**
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Index implements SearchIndexInterface
 {
diff --git a/library/Zend/Search/Lucene/Index/DictionaryLoader.php b/library/Zend/Search/Lucene/Index/DictionaryLoader.php
index 2acfcfe901d..d1b90f70b67 100644
--- a/library/Zend/Search/Lucene/Index/DictionaryLoader.php
+++ b/library/Zend/Search/Lucene/Index/DictionaryLoader.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DictionaryLoader
 {
diff --git a/library/Zend/Search/Lucene/Index/DocsFilter.php b/library/Zend/Search/Lucene/Index/DocsFilter.php
index 9041a8d9a7b..01304211279 100644
--- a/library/Zend/Search/Lucene/Index/DocsFilter.php
+++ b/library/Zend/Search/Lucene/Index/DocsFilter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocsFilter
 {
diff --git a/library/Zend/Search/Lucene/Index/FieldInfo.php b/library/Zend/Search/Lucene/Index/FieldInfo.php
index 30be6195a20..713b7c8854b 100644
--- a/library/Zend/Search/Lucene/Index/FieldInfo.php
+++ b/library/Zend/Search/Lucene/Index/FieldInfo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FieldInfo
 {
diff --git a/library/Zend/Search/Lucene/Index/SegmentInfo.php b/library/Zend/Search/Lucene/Index/SegmentInfo.php
index b06bb570f86..ecebb743d79 100644
--- a/library/Zend/Search/Lucene/Index/SegmentInfo.php
+++ b/library/Zend/Search/Lucene/Index/SegmentInfo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SegmentInfo implements TermsStreamInterface
 {
diff --git a/library/Zend/Search/Lucene/Index/SegmentMerger.php b/library/Zend/Search/Lucene/Index/SegmentMerger.php
index 65440147395..6121f7cd1cd 100644
--- a/library/Zend/Search/Lucene/Index/SegmentMerger.php
+++ b/library/Zend/Search/Lucene/Index/SegmentMerger.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SegmentMerger
 {
diff --git a/library/Zend/Search/Lucene/Index/SegmentWriter/AbstractSegmentWriter.php b/library/Zend/Search/Lucene/Index/SegmentWriter/AbstractSegmentWriter.php
index 850758b921a..aed45f93d7e 100644
--- a/library/Zend/Search/Lucene/Index/SegmentWriter/AbstractSegmentWriter.php
+++ b/library/Zend/Search/Lucene/Index/SegmentWriter/AbstractSegmentWriter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index\SegmentWriter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractSegmentWriter
 {
diff --git a/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php b/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php
index a8636a39646..b2d098afee2 100644
--- a/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php
+++ b/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index\SegmentWriter;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentWriter extends AbstractSegmentWriter
 {
diff --git a/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php b/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php
index 913cd7cf661..8ccbcd8eea7 100644
--- a/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php
+++ b/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index\SegmentWriter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StreamWriter extends AbstractSegmentWriter
 {
diff --git a/library/Zend/Search/Lucene/Index/Term.php b/library/Zend/Search/Lucene/Index/Term.php
index 7ce0b902b82..50462b772f3 100644
--- a/library/Zend/Search/Lucene/Index/Term.php
+++ b/library/Zend/Search/Lucene/Index/Term.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Term
 {
diff --git a/library/Zend/Search/Lucene/Index/TermInfo.php b/library/Zend/Search/Lucene/Index/TermInfo.php
index 6b7f5c369a2..ca762206373 100644
--- a/library/Zend/Search/Lucene/Index/TermInfo.php
+++ b/library/Zend/Search/Lucene/Index/TermInfo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TermInfo
 {
diff --git a/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php b/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php
index 22973a58f10..70af699cb09 100644
--- a/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php
+++ b/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TermsPriorityQueue extends Lucene\AbstractPriorityQueue
 {
diff --git a/library/Zend/Search/Lucene/Index/TermsStreamInterface.php b/library/Zend/Search/Lucene/Index/TermsStreamInterface.php
index ee4f079a4a7..90466437e89 100644
--- a/library/Zend/Search/Lucene/Index/TermsStreamInterface.php
+++ b/library/Zend/Search/Lucene/Index/TermsStreamInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TermsStreamInterface
 {
diff --git a/library/Zend/Search/Lucene/Index/Writer.php b/library/Zend/Search/Lucene/Index/Writer.php
index 7c956cd75ac..8ee5a63041a 100644
--- a/library/Zend/Search/Lucene/Index/Writer.php
+++ b/library/Zend/Search/Lucene/Index/Writer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Index;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Writer
 {
diff --git a/library/Zend/Search/Lucene/LockManager.php b/library/Zend/Search/Lucene/LockManager.php
index 76f7332445b..cba0ff3e3d7 100644
--- a/library/Zend/Search/Lucene/LockManager.php
+++ b/library/Zend/Search/Lucene/LockManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LockManager
 {
diff --git a/library/Zend/Search/Lucene/Lucene.php b/library/Zend/Search/Lucene/Lucene.php
index 4b220b11cfb..96e6e330f88 100644
--- a/library/Zend/Search/Lucene/Lucene.php
+++ b/library/Zend/Search/Lucene/Lucene.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Lucene
 {
diff --git a/library/Zend/Search/Lucene/MultiSearcher.php b/library/Zend/Search/Lucene/MultiSearcher.php
index ce14bac44f4..846bf611377 100644
--- a/library/Zend/Search/Lucene/MultiSearcher.php
+++ b/library/Zend/Search/Lucene/MultiSearcher.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MultiSearcher implements SearchIndexInterface
 {
diff --git a/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php b/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
index 291a2017aca..b7049709c19 100644
--- a/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
+++ b/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BooleanExpressionRecognizer extends Lucene\AbstractFSM
 {
diff --git a/library/Zend/Search/Lucene/Search/Exception/QueryParserException.php b/library/Zend/Search/Lucene/Search/Exception/QueryParserException.php
index 7cc8a7547ca..959608e0c42 100644
--- a/library/Zend/Search/Lucene/Search/Exception/QueryParserException.php
+++ b/library/Zend/Search/Lucene/Search/Exception/QueryParserException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  *
  * Special exception type, which may be used to intercept wrong user input
  */
diff --git a/library/Zend/Search/Lucene/Search/Highlighter/DefaultHighlighter.php b/library/Zend/Search/Lucene/Search/Highlighter/DefaultHighlighter.php
index 75839c3eb4d..64475ea2caf 100644
--- a/library/Zend/Search/Lucene/Search/Highlighter/DefaultHighlighter.php
+++ b/library/Zend/Search/Lucene/Search/Highlighter/DefaultHighlighter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Highlighter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultHighlighter implements HighlighterInterface
 {
diff --git a/library/Zend/Search/Lucene/Search/Highlighter/HighlighterInterface.php b/library/Zend/Search/Lucene/Search/Highlighter/HighlighterInterface.php
index 46f0a7a58bd..e75c61ee452 100644
--- a/library/Zend/Search/Lucene/Search/Highlighter/HighlighterInterface.php
+++ b/library/Zend/Search/Lucene/Search/Highlighter/HighlighterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Highlighter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface HighlighterInterface
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/AbstractQuery.php b/library/Zend/Search/Lucene/Search/Query/AbstractQuery.php
index 5986088fce3..859fef21085 100644
--- a/library/Zend/Search/Lucene/Search/Query/AbstractQuery.php
+++ b/library/Zend/Search/Lucene/Search/Query/AbstractQuery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Boolean.php b/library/Zend/Search/Lucene/Search/Query/Boolean.php
index cb19af74826..e5ba5e9c7cf 100644
--- a/library/Zend/Search/Lucene/Search/Query/Boolean.php
+++ b/library/Zend/Search/Lucene/Search/Query/Boolean.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Boolean extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/EmptyResult.php b/library/Zend/Search/Lucene/Search/Query/EmptyResult.php
index 6bbdb166750..558d8b21af7 100644
--- a/library/Zend/Search/Lucene/Search/Query/EmptyResult.php
+++ b/library/Zend/Search/Lucene/Search/Query/EmptyResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmptyResult extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Fuzzy.php b/library/Zend/Search/Lucene/Search/Query/Fuzzy.php
index e73cf34a748..41e0f97694c 100644
--- a/library/Zend/Search/Lucene/Search/Query/Fuzzy.php
+++ b/library/Zend/Search/Lucene/Search/Query/Fuzzy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Fuzzy extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Insignificant.php b/library/Zend/Search/Lucene/Search/Query/Insignificant.php
index 3ef85384160..c76f937dcad 100644
--- a/library/Zend/Search/Lucene/Search/Query/Insignificant.php
+++ b/library/Zend/Search/Lucene/Search/Query/Insignificant.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Insignificant extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/MultiTerm.php b/library/Zend/Search/Lucene/Search/Query/MultiTerm.php
index 0a7c1e8c155..cc6c77a88a1 100644
--- a/library/Zend/Search/Lucene/Search/Query/MultiTerm.php
+++ b/library/Zend/Search/Lucene/Search/Query/MultiTerm.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MultiTerm extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Phrase.php b/library/Zend/Search/Lucene/Search/Query/Phrase.php
index 6b71e91699a..0921207c1f8 100644
--- a/library/Zend/Search/Lucene/Search/Query/Phrase.php
+++ b/library/Zend/Search/Lucene/Search/Query/Phrase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Phrase extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing/AbstractPreprocessing.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing/AbstractPreprocessing.php
index c0f0fa5a1a8..7a619e45d1a 100644
--- a/library/Zend/Search/Lucene/Search/Query/Preprocessing/AbstractPreprocessing.php
+++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing/AbstractPreprocessing.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query\Preprocessing;
@@ -33,8 +31,6 @@
  * @package    Zend_Search_Lucene
  * @subpackage Search
  * @internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPreprocessing extends Query\AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php
index a0e373f7d0a..e2d4438627c 100644
--- a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php
+++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query\Preprocessing;
@@ -37,8 +35,6 @@
  * @package    Zend_Search_Lucene
  * @subpackage Search
  * @internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Fuzzy extends AbstractPreprocessing
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php
index 0b7fd803779..a7e62a48ed3 100644
--- a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php
+++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query\Preprocessing;
@@ -36,8 +34,6 @@
  * @package    Zend_Search_Lucene
  * @subpackage Search
  * @internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Phrase extends AbstractPreprocessing
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php
index 95fc3e99ed1..be687811464 100644
--- a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php
+++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query\Preprocessing;
@@ -36,8 +34,6 @@
  * @package    Zend_Search_Lucene
  * @subpackage Search
  * @internal
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Term extends AbstractPreprocessing
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Range.php b/library/Zend/Search/Lucene/Search/Query/Range.php
index 8b76ab724e0..22bf9603c6c 100644
--- a/library/Zend/Search/Lucene/Search/Query/Range.php
+++ b/library/Zend/Search/Lucene/Search/Query/Range.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Range extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Term.php b/library/Zend/Search/Lucene/Search/Query/Term.php
index bbd35720dc8..2b986c81056 100644
--- a/library/Zend/Search/Lucene/Search/Query/Term.php
+++ b/library/Zend/Search/Lucene/Search/Query/Term.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Term extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/Query/Wildcard.php b/library/Zend/Search/Lucene/Search/Query/Wildcard.php
index 20142de9659..0e790ce1375 100644
--- a/library/Zend/Search/Lucene/Search/Query/Wildcard.php
+++ b/library/Zend/Search/Lucene/Search/Query/Wildcard.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Query;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Wildcard extends AbstractQuery
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryEntry/AbstractQueryEntry.php b/library/Zend/Search/Lucene/Search/QueryEntry/AbstractQueryEntry.php
index c527533d665..538aa9d57d9 100644
--- a/library/Zend/Search/Lucene/Search/QueryEntry/AbstractQueryEntry.php
+++ b/library/Zend/Search/Lucene/Search/QueryEntry/AbstractQueryEntry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\QueryEntry;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractQueryEntry
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php b/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php
index 3cd9b37119d..5caa669aeb0 100644
--- a/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php
+++ b/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\QueryEntry;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Phrase extends AbstractQueryEntry
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php b/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php
index bafe5498983..4ae1818229a 100644
--- a/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php
+++ b/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\QueryEntry;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Subquery extends AbstractQueryEntry
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryEntry/Term.php b/library/Zend/Search/Lucene/Search/QueryEntry/Term.php
index 9e383abda99..42f8cda3880 100644
--- a/library/Zend/Search/Lucene/Search/QueryEntry/Term.php
+++ b/library/Zend/Search/Lucene/Search/QueryEntry/Term.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\QueryEntry;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Term extends AbstractQueryEntry
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryHit.php b/library/Zend/Search/Lucene/Search/QueryHit.php
index 0e3dda4f5b0..ec229b03b49 100644
--- a/library/Zend/Search/Lucene/Search/QueryHit.php
+++ b/library/Zend/Search/Lucene/Search/QueryHit.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryHit
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryLexer.php b/library/Zend/Search/Lucene/Search/QueryLexer.php
index 4d3edb925f6..eb4f9ab9748 100644
--- a/library/Zend/Search/Lucene/Search/QueryLexer.php
+++ b/library/Zend/Search/Lucene/Search/QueryLexer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryLexer extends Lucene\AbstractFSM
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryParser.php b/library/Zend/Search/Lucene/Search/QueryParser.php
index f46cda27ebd..6620a11d2f2 100644
--- a/library/Zend/Search/Lucene/Search/QueryParser.php
+++ b/library/Zend/Search/Lucene/Search/QueryParser.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryParser extends Lucene\AbstractFSM
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryParserContext.php b/library/Zend/Search/Lucene/Search/QueryParserContext.php
index 9cb3207fb49..6407d662f13 100644
--- a/library/Zend/Search/Lucene/Search/QueryParserContext.php
+++ b/library/Zend/Search/Lucene/Search/QueryParserContext.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryParserContext
 {
diff --git a/library/Zend/Search/Lucene/Search/QueryToken.php b/library/Zend/Search/Lucene/Search/QueryToken.php
index 3bf86610127..23ed2b53eec 100644
--- a/library/Zend/Search/Lucene/Search/QueryToken.php
+++ b/library/Zend/Search/Lucene/Search/QueryToken.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryToken
 {
diff --git a/library/Zend/Search/Lucene/Search/Similarity/AbstractSimilarity.php b/library/Zend/Search/Lucene/Search/Similarity/AbstractSimilarity.php
index b53e549d4a0..05bbc55d6ec 100644
--- a/library/Zend/Search/Lucene/Search/Similarity/AbstractSimilarity.php
+++ b/library/Zend/Search/Lucene/Search/Similarity/AbstractSimilarity.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Similarity;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractSimilarity
 {
diff --git a/library/Zend/Search/Lucene/Search/Similarity/DefaultSimilarity.php b/library/Zend/Search/Lucene/Search/Similarity/DefaultSimilarity.php
index 079d7d896fb..5e9590ae33e 100644
--- a/library/Zend/Search/Lucene/Search/Similarity/DefaultSimilarity.php
+++ b/library/Zend/Search/Lucene/Search/Similarity/DefaultSimilarity.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Similarity;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultSimilarity extends AbstractSimilarity
 {
diff --git a/library/Zend/Search/Lucene/Search/Weight/AbstractWeight.php b/library/Zend/Search/Lucene/Search/Weight/AbstractWeight.php
index 372e033d6d6..167db2d21fe 100644
--- a/library/Zend/Search/Lucene/Search/Weight/AbstractWeight.php
+++ b/library/Zend/Search/Lucene/Search/Weight/AbstractWeight.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Weight;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractWeight
 {
diff --git a/library/Zend/Search/Lucene/Search/Weight/Boolean.php b/library/Zend/Search/Lucene/Search/Weight/Boolean.php
index 85d6c0f4640..c1529601679 100644
--- a/library/Zend/Search/Lucene/Search/Weight/Boolean.php
+++ b/library/Zend/Search/Lucene/Search/Weight/Boolean.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Weight;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Boolean extends AbstractWeight
 {
diff --git a/library/Zend/Search/Lucene/Search/Weight/EmptyResultWeight.php b/library/Zend/Search/Lucene/Search/Weight/EmptyResultWeight.php
index 40f18d336ba..ee761da37be 100644
--- a/library/Zend/Search/Lucene/Search/Weight/EmptyResultWeight.php
+++ b/library/Zend/Search/Lucene/Search/Weight/EmptyResultWeight.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Weight;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmptyResultWeight extends AbstractWeight
 {
diff --git a/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php b/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php
index 47f8c3cffe8..602da3a1ed0 100644
--- a/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php
+++ b/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Weight;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MultiTerm extends AbstractWeight
 {
diff --git a/library/Zend/Search/Lucene/Search/Weight/Phrase.php b/library/Zend/Search/Lucene/Search/Weight/Phrase.php
index 78231a9fd6e..f4239ca66f0 100644
--- a/library/Zend/Search/Lucene/Search/Weight/Phrase.php
+++ b/library/Zend/Search/Lucene/Search/Weight/Phrase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Weight;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Phrase extends AbstractWeight
 {
diff --git a/library/Zend/Search/Lucene/Search/Weight/Term.php b/library/Zend/Search/Lucene/Search/Weight/Term.php
index b2753b972ba..dc1f5f30ab0 100644
--- a/library/Zend/Search/Lucene/Search/Weight/Term.php
+++ b/library/Zend/Search/Lucene/Search/Weight/Term.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Search\Weight;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Search
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Term extends AbstractWeight
 {
diff --git a/library/Zend/Search/Lucene/SearchIndexInterface.php b/library/Zend/Search/Lucene/SearchIndexInterface.php
index ed83d3d93f2..a0353193aee 100644
--- a/library/Zend/Search/Lucene/SearchIndexInterface.php
+++ b/library/Zend/Search/Lucene/SearchIndexInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface SearchIndexInterface extends Index\TermsStreamInterface
 {
diff --git a/library/Zend/Search/Lucene/Storage/Directory/DirectoryInterface.php b/library/Zend/Search/Lucene/Storage/Directory/DirectoryInterface.php
index e9afca9e08f..a0de5cc03a8 100644
--- a/library/Zend/Search/Lucene/Storage/Directory/DirectoryInterface.php
+++ b/library/Zend/Search/Lucene/Storage/Directory/DirectoryInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Storage\Directory;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface DirectoryInterface
 {
diff --git a/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php b/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
index 3a8e92d2f07..71ecc45f1c7 100644
--- a/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
+++ b/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Storage\Directory;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Filesystem implements DirectoryInterface
 {
diff --git a/library/Zend/Search/Lucene/Storage/File/AbstractFile.php b/library/Zend/Search/Lucene/Storage/File/AbstractFile.php
index 5f9fd95319b..0d449986cd5 100644
--- a/library/Zend/Search/Lucene/Storage/File/AbstractFile.php
+++ b/library/Zend/Search/Lucene/Storage/File/AbstractFile.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Storage\File;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFile implements FileInterface
 {
diff --git a/library/Zend/Search/Lucene/Storage/File/FileInterface.php b/library/Zend/Search/Lucene/Storage/File/FileInterface.php
index a6f236a5430..849c1b681d7 100644
--- a/library/Zend/Search/Lucene/Storage/File/FileInterface.php
+++ b/library/Zend/Search/Lucene/Storage/File/FileInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Storage\File;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface FileInterface
 {
diff --git a/library/Zend/Search/Lucene/Storage/File/Filesystem.php b/library/Zend/Search/Lucene/Storage/File/Filesystem.php
index a803a7fa6b8..bf600399309 100644
--- a/library/Zend/Search/Lucene/Storage/File/Filesystem.php
+++ b/library/Zend/Search/Lucene/Storage/File/Filesystem.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Storage\File;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Filesystem extends AbstractFile
 {
diff --git a/library/Zend/Search/Lucene/Storage/File/Memory.php b/library/Zend/Search/Lucene/Storage/File/Memory.php
index 4348d5924d2..0bd8bf0a170 100644
--- a/library/Zend/Search/Lucene/Storage/File/Memory.php
+++ b/library/Zend/Search/Lucene/Storage/File/Memory.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene\Storage\File;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Memory extends AbstractFile
 {
diff --git a/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php b/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php
index 621f779fdd2..ab666748857 100644
--- a/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php
+++ b/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Search\Lucene;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Index
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TermStreamsPriorityQueue implements Index\TermsStreamInterface
 {
diff --git a/library/Zend/Serializer/Adapter/AbstractAdapter.php b/library/Zend/Serializer/Adapter/AbstractAdapter.php
index 29674d336a8..2f08b7ca6f6 100644
--- a/library/Zend/Serializer/Adapter/AbstractAdapter.php
+++ b/library/Zend/Serializer/Adapter/AbstractAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements SerializationAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/AdapterInterface.php b/library/Zend/Serializer/Adapter/AdapterInterface.php
index 9371cac1779..a7955342753 100644
--- a/library/Zend/Serializer/Adapter/AdapterInterface.php
+++ b/library/Zend/Serializer/Adapter/AdapterInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/Serializer/Adapter/Amf0.php b/library/Zend/Serializer/Adapter/Amf0.php
index 5e05626665b..b3b3e9d0b5b 100644
--- a/library/Zend/Serializer/Adapter/Amf0.php
+++ b/library/Zend/Serializer/Adapter/Amf0.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Amf0 extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/Amf3.php b/library/Zend/Serializer/Adapter/Amf3.php
index e65700f257a..d9adc2d3043 100644
--- a/library/Zend/Serializer/Adapter/Amf3.php
+++ b/library/Zend/Serializer/Adapter/Amf3.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Amf3 extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/IgBinary.php b/library/Zend/Serializer/Adapter/IgBinary.php
index fecc3b4221a..d4f7e4a0bff 100644
--- a/library/Zend/Serializer/Adapter/IgBinary.php
+++ b/library/Zend/Serializer/Adapter/IgBinary.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IgBinary extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/Json.php b/library/Zend/Serializer/Adapter/Json.php
index f49b3a0a508..461e83c62a3 100644
--- a/library/Zend/Serializer/Adapter/Json.php
+++ b/library/Zend/Serializer/Adapter/Json.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Json extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/PhpCode.php b/library/Zend/Serializer/Adapter/PhpCode.php
index 9909c066eea..e27b1fd684c 100644
--- a/library/Zend/Serializer/Adapter/PhpCode.php
+++ b/library/Zend/Serializer/Adapter/PhpCode.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhpCode extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/PhpSerialize.php b/library/Zend/Serializer/Adapter/PhpSerialize.php
index 30a997edbf6..8087eb60524 100644
--- a/library/Zend/Serializer/Adapter/PhpSerialize.php
+++ b/library/Zend/Serializer/Adapter/PhpSerialize.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhpSerialize extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/PythonPickle.php b/library/Zend/Serializer/Adapter/PythonPickle.php
index feb4e8881e7..418ce64dbe1 100644
--- a/library/Zend/Serializer/Adapter/PythonPickle.php
+++ b/library/Zend/Serializer/Adapter/PythonPickle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PythonPickle extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/Adapter/Wddx.php b/library/Zend/Serializer/Adapter/Wddx.php
index be077c6711c..1c454389e8a 100644
--- a/library/Zend/Serializer/Adapter/Wddx.php
+++ b/library/Zend/Serializer/Adapter/Wddx.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Adapter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Wddx extends AbstractAdapter
 {
diff --git a/library/Zend/Serializer/AdapterPluginManager.php b/library/Zend/Serializer/AdapterPluginManager.php
index 2b811e73662..a932ee4b9ce 100644
--- a/library/Zend/Serializer/AdapterPluginManager.php
+++ b/library/Zend/Serializer/AdapterPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer;
@@ -31,8 +29,6 @@
  *
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AdapterPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Serializer/Exception/ExceptionInterface.php b/library/Zend/Serializer/Exception/ExceptionInterface.php
index 1cf1c87905c..00e659844c5 100644
--- a/library/Zend/Serializer/Exception/ExceptionInterface.php
+++ b/library/Zend/Serializer/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category  Zend
  * @package   Zend_Serializer
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php b/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
index 7083ceb1443..5be5dc77d74 100644
--- a/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExtensionNotLoadedException
     extends RuntimeException
diff --git a/library/Zend/Serializer/Exception/InvalidArgumentException.php b/library/Zend/Serializer/Exception/InvalidArgumentException.php
index 665ef2621ce..85fb97465f9 100644
--- a/library/Zend/Serializer/Exception/InvalidArgumentException.php
+++ b/library/Zend/Serializer/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -25,8 +23,6 @@
  * @used       InvalidArgumentException
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Serializer/Exception/RuntimeException.php b/library/Zend/Serializer/Exception/RuntimeException.php
index 48a3dc3be18..9666a99a410 100644
--- a/library/Zend/Serializer/Exception/RuntimeException.php
+++ b/library/Zend/Serializer/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -25,8 +23,6 @@
  * @used       RuntimeException
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/Serializer/Serializer.php b/library/Zend/Serializer/Serializer.php
index 168cffabf96..5e422cfe878 100644
--- a/library/Zend/Serializer/Serializer.php
+++ b/library/Zend/Serializer/Serializer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Serializer;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Serializer
 {
diff --git a/library/Zend/Server/AbstractServer.php b/library/Zend/Server/AbstractServer.php
index 0686e1dbcf9..c2ebcc72f06 100644
--- a/library/Zend/Server/AbstractServer.php
+++ b/library/Zend/Server/AbstractServer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractServer implements Server
 {
diff --git a/library/Zend/Server/Cache.php b/library/Zend/Server/Cache.php
index 031161daff7..bceb815fcf3 100644
--- a/library/Zend/Server/Cache.php
+++ b/library/Zend/Server/Cache.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cache
 {
diff --git a/library/Zend/Server/Client.php b/library/Zend/Server/Client.php
index 625d285767c..981fb716800 100644
--- a/library/Zend/Server/Client.php
+++ b/library/Zend/Server/Client.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Client
 {
diff --git a/library/Zend/Server/Definition.php b/library/Zend/Server/Definition.php
index a70ed5e99e7..0cd41ed7d9a 100644
--- a/library/Zend/Server/Definition.php
+++ b/library/Zend/Server/Definition.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Definition implements \Countable, \Iterator
 {
diff --git a/library/Zend/Server/Exception/BadMethodCallException.php b/library/Zend/Server/Exception/BadMethodCallException.php
index 5c83f09b42d..ca3614840d2 100644
--- a/library/Zend/Server/Exception/BadMethodCallException.php
+++ b/library/Zend/Server/Exception/BadMethodCallException.php
@@ -5,4 +5,4 @@
 class BadMethodCallException
     extends \BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Server/Exception/ExceptionInterface.php b/library/Zend/Server/Exception/ExceptionInterface.php
index cc3b51f67f2..241334cce57 100644
--- a/library/Zend/Server/Exception/ExceptionInterface.php
+++ b/library/Zend/Server/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Server/Exception/InvalidArgumentException.php b/library/Zend/Server/Exception/InvalidArgumentException.php
index 32f93b27233..0c5ee19f1c0 100644
--- a/library/Zend/Server/Exception/InvalidArgumentException.php
+++ b/library/Zend/Server/Exception/InvalidArgumentException.php
@@ -5,4 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Server/Exception/RuntimeException.php b/library/Zend/Server/Exception/RuntimeException.php
index 9d1965de44e..4d664ba8998 100644
--- a/library/Zend/Server/Exception/RuntimeException.php
+++ b/library/Zend/Server/Exception/RuntimeException.php
@@ -5,4 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Server/Method/Callback.php b/library/Zend/Server/Method/Callback.php
index 99766bd5752..010b37c0297 100644
--- a/library/Zend/Server/Method/Callback.php
+++ b/library/Zend/Server/Method/Callback.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Method;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Callback
 {
diff --git a/library/Zend/Server/Method/Definition.php b/library/Zend/Server/Method/Definition.php
index 138a7ed0e09..eb5047e88e1 100644
--- a/library/Zend/Server/Method/Definition.php
+++ b/library/Zend/Server/Method/Definition.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Method;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Definition
 {
diff --git a/library/Zend/Server/Method/Parameter.php b/library/Zend/Server/Method/Parameter.php
index b2be46951d5..05fa0de126b 100644
--- a/library/Zend/Server/Method/Parameter.php
+++ b/library/Zend/Server/Method/Parameter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Method;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Parameter
 {
diff --git a/library/Zend/Server/Method/Prototype.php b/library/Zend/Server/Method/Prototype.php
index 5cc9b6969dc..12b0fe49477 100644
--- a/library/Zend/Server/Method/Prototype.php
+++ b/library/Zend/Server/Method/Prototype.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Method;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Method
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Prototype
 {
diff --git a/library/Zend/Server/Reflection.php b/library/Zend/Server/Reflection.php
index 49f11102640..7145ed325bf 100644
--- a/library/Zend/Server/Reflection.php
+++ b/library/Zend/Server/Reflection.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Reflection
 {
diff --git a/library/Zend/Server/Reflection/AbstractFunction.php b/library/Zend/Server/Reflection/AbstractFunction.php
index 52fd3d8ad52..f293581594c 100644
--- a/library/Zend/Server/Reflection/AbstractFunction.php
+++ b/library/Zend/Server/Reflection/AbstractFunction.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFunction
 {
diff --git a/library/Zend/Server/Reflection/Exception/BadMethodCallException.php b/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
index 920e30fccc1..42e01a2a15d 100644
--- a/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
+++ b/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
@@ -7,4 +7,4 @@
 class BadMethodCallException
     extends Exception\BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Server/Reflection/Exception/ExceptionInterface.php b/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
index ee59219d188..c7d45ec0006 100644
--- a/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
+++ b/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection\Exception;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php b/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
index 7893059736e..cbd379fc445 100644
--- a/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
+++ b/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Server/Reflection/Exception/RuntimeException.php b/library/Zend/Server/Reflection/Exception/RuntimeException.php
index 4fb01138cc4..6fcb482bbdc 100644
--- a/library/Zend/Server/Reflection/Exception/RuntimeException.php
+++ b/library/Zend/Server/Reflection/Exception/RuntimeException.php
@@ -7,4 +7,4 @@
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Server/Reflection/Node.php b/library/Zend/Server/Reflection/Node.php
index cc9a3b10c2b..d28796abdb3 100644
--- a/library/Zend/Server/Reflection/Node.php
+++ b/library/Zend/Server/Reflection/Node.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Node
 {
diff --git a/library/Zend/Server/Reflection/Prototype.php b/library/Zend/Server/Reflection/Prototype.php
index 73967d03b8b..bd4b84786b6 100644
--- a/library/Zend/Server/Reflection/Prototype.php
+++ b/library/Zend/Server/Reflection/Prototype.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Prototype
 {
diff --git a/library/Zend/Server/Reflection/ReflectionClass.php b/library/Zend/Server/Reflection/ReflectionClass.php
index 25c807e64ae..7c59eee87d4 100644
--- a/library/Zend/Server/Reflection/ReflectionClass.php
+++ b/library/Zend/Server/Reflection/ReflectionClass.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReflectionClass
 {
diff --git a/library/Zend/Server/Reflection/ReflectionFunction.php b/library/Zend/Server/Reflection/ReflectionFunction.php
index bc1e9d69115..3ea1817cb4e 100644
--- a/library/Zend/Server/Reflection/ReflectionFunction.php
+++ b/library/Zend/Server/Reflection/ReflectionFunction.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReflectionFunction extends AbstractFunction
 {
diff --git a/library/Zend/Server/Reflection/ReflectionMethod.php b/library/Zend/Server/Reflection/ReflectionMethod.php
index b6b5d7a0cf0..a780f33e442 100644
--- a/library/Zend/Server/Reflection/ReflectionMethod.php
+++ b/library/Zend/Server/Reflection/ReflectionMethod.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReflectionMethod extends AbstractFunction
 {
diff --git a/library/Zend/Server/Reflection/ReflectionParameter.php b/library/Zend/Server/Reflection/ReflectionParameter.php
index 2fbb8e790b6..4f08864501d 100644
--- a/library/Zend/Server/Reflection/ReflectionParameter.php
+++ b/library/Zend/Server/Reflection/ReflectionParameter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReflectionParameter
 {
diff --git a/library/Zend/Server/Reflection/ReflectionReturnValue.php b/library/Zend/Server/Reflection/ReflectionReturnValue.php
index 510f9e20865..b78a4e3f35d 100644
--- a/library/Zend/Server/Reflection/ReflectionReturnValue.php
+++ b/library/Zend/Server/Reflection/ReflectionReturnValue.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server\Reflection;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Zend_Server_Reflection
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReflectionReturnValue
 {
diff --git a/library/Zend/Server/Server.php b/library/Zend/Server/Server.php
index 3ad49ed3f9e..fc4d5956d92 100644
--- a/library/Zend/Server/Server.php
+++ b/library/Zend/Server/Server.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Server;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Server
 {
diff --git a/library/Zend/Service/AbstractService.php b/library/Zend/Service/AbstractService.php
index 9a1b2a49346..08835d2d96b 100644
--- a/library/Zend/Service/AbstractService.php
+++ b/library/Zend/Service/AbstractService.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractService
 {
diff --git a/library/Zend/Service/AgileZen/AbstractEntity.php b/library/Zend/Service/AgileZen/AbstractEntity.php
index 20562ce5ef1..d92709dcf62 100644
--- a/library/Zend/Service/AgileZen/AbstractEntity.php
+++ b/library/Zend/Service/AgileZen/AbstractEntity.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/AgileZen.php b/library/Zend/Service/AgileZen/AgileZen.php
index b14b010259c..bdd2a66758e 100644
--- a/library/Zend/Service/AgileZen/AgileZen.php
+++ b/library/Zend/Service/AgileZen/AgileZen.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AgileZen
 {
diff --git a/library/Zend/Service/AgileZen/Container.php b/library/Zend/Service/AgileZen/Container.php
index 95851abac36..d633f99f6ab 100644
--- a/library/Zend/Service/AgileZen/Container.php
+++ b/library/Zend/Service/AgileZen/Container.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Container implements Countable, Iterator, ArrayAccess
 {
diff --git a/library/Zend/Service/AgileZen/Exception/ExceptionInterface.php b/library/Zend/Service/AgileZen/Exception/ExceptionInterface.php
index 2216187c1e5..fc98a8c3d6a 100644
--- a/library/Zend/Service/AgileZen/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/AgileZen/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/AgileZen/Exception/InvalidArgumentException.php b/library/Zend/Service/AgileZen/Exception/InvalidArgumentException.php
index 61751135466..f20b15c8a81 100644
--- a/library/Zend/Service/AgileZen/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/AgileZen/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/AgileZen/Exception/OutOfBoundsException.php b/library/Zend/Service/AgileZen/Exception/OutOfBoundsException.php
index a2f6d21744f..057fa14d9d3 100644
--- a/library/Zend/Service/AgileZen/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/AgileZen/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/AgileZen/Exception/RuntimeException.php b/library/Zend/Service/AgileZen/Exception/RuntimeException.php
index 77b51c933e3..73b7806d8a2 100644
--- a/library/Zend/Service/AgileZen/Exception/RuntimeException.php
+++ b/library/Zend/Service/AgileZen/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Exception;
@@ -24,8 +22,6 @@
 /**
  * @package    Zend_Service
  * @subpackage AgileZen
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Attachment.php b/library/Zend/Service/AgileZen/Resources/Attachment.php
index 09df14b5fcb..3c19a9c9390 100644
--- a/library/Zend/Service/AgileZen/Resources/Attachment.php
+++ b/library/Zend/Service/AgileZen/Resources/Attachment.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Attachment extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Comment.php b/library/Zend/Service/AgileZen/Resources/Comment.php
index ea73dfa9280..3dda27570c0 100644
--- a/library/Zend/Service/AgileZen/Resources/Comment.php
+++ b/library/Zend/Service/AgileZen/Resources/Comment.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Comment extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Exception/ExceptionInterface.php b/library/Zend/Service/AgileZen/Resources/Exception/ExceptionInterface.php
index 40bb77d0a05..aba200bd255 100644
--- a/library/Zend/Service/AgileZen/Resources/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/AgileZen/Resources/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends AgileZenException
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Exception/InvalidArgumentException.php b/library/Zend/Service/AgileZen/Resources/Exception/InvalidArgumentException.php
index 23b72a22b78..bd6b943ef3c 100644
--- a/library/Zend/Service/AgileZen/Resources/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/AgileZen/Resources/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Exception/OutOfBoundsException.php b/library/Zend/Service/AgileZen/Resources/Exception/OutOfBoundsException.php
index 5ba3468a1b6..32fe079ecc1 100644
--- a/library/Zend/Service/AgileZen/Resources/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/AgileZen/Resources/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Exception/RuntimeException.php b/library/Zend/Service/AgileZen/Resources/Exception/RuntimeException.php
index 5658efaaf62..7a01b70b958 100644
--- a/library/Zend/Service/AgileZen/Resources/Exception/RuntimeException.php
+++ b/library/Zend/Service/AgileZen/Resources/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources_Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException  extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Invite.php b/library/Zend/Service/AgileZen/Resources/Invite.php
index 13ce0e5c351..83498b80909 100644
--- a/library/Zend/Service/AgileZen/Resources/Invite.php
+++ b/library/Zend/Service/AgileZen/Resources/Invite.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Invite extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Phase.php b/library/Zend/Service/AgileZen/Resources/Phase.php
index a6cd68b9abe..25c759879bf 100644
--- a/library/Zend/Service/AgileZen/Resources/Phase.php
+++ b/library/Zend/Service/AgileZen/Resources/Phase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Phase extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Project.php b/library/Zend/Service/AgileZen/Resources/Project.php
index 7d6e05227f0..c4bfc17856c 100644
--- a/library/Zend/Service/AgileZen/Resources/Project.php
+++ b/library/Zend/Service/AgileZen/Resources/Project.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Project extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Role.php b/library/Zend/Service/AgileZen/Resources/Role.php
index 8ad22a02ad6..a9295e5c71d 100644
--- a/library/Zend/Service/AgileZen/Resources/Role.php
+++ b/library/Zend/Service/AgileZen/Resources/Role.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Role extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Story.php b/library/Zend/Service/AgileZen/Resources/Story.php
index 9a55ec0b418..c66f7baac71 100644
--- a/library/Zend/Service/AgileZen/Resources/Story.php
+++ b/library/Zend/Service/AgileZen/Resources/Story.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Story extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Tag.php b/library/Zend/Service/AgileZen/Resources/Tag.php
index fb1d8a6691d..5dbf623123c 100644
--- a/library/Zend/Service/AgileZen/Resources/Tag.php
+++ b/library/Zend/Service/AgileZen/Resources/Tag.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Tag extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/Task.php b/library/Zend/Service/AgileZen/Resources/Task.php
index 3de83b4d424..ffeb97d4589 100644
--- a/library/Zend/Service/AgileZen/Resources/Task.php
+++ b/library/Zend/Service/AgileZen/Resources/Task.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Task extends AbstractEntity
 {
diff --git a/library/Zend/Service/AgileZen/Resources/User.php b/library/Zend/Service/AgileZen/Resources/User.php
index 1b8cf8dc106..5cff70f7497 100644
--- a/library/Zend/Service/AgileZen/Resources/User.php
+++ b/library/Zend/Service/AgileZen/Resources/User.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\AgileZen\Resources;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage AgileZen_Resources
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class User extends AbstractEntity
 {
diff --git a/library/Zend/Service/Akismet/Akismet.php b/library/Zend/Service/Akismet/Akismet.php
index b5c96296008..f722a0a01f0 100644
--- a/library/Zend/Service/Akismet/Akismet.php
+++ b/library/Zend/Service/Akismet/Akismet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Akismet
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Akismet;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Akismet
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Akismet extends \Zend\Service\AbstractService
 {
diff --git a/library/Zend/Service/Akismet/Exception/ExceptionInterface.php b/library/Zend/Service/Akismet/Exception/ExceptionInterface.php
index 609e062b023..fb67be8d14c 100644
--- a/library/Zend/Service/Akismet/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Akismet/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Akismet
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/Akismet/Exception/InvalidArgumentException.php b/library/Zend/Service/Akismet/Exception/InvalidArgumentException.php
index d50f4b99c5c..c72c86408de 100644
--- a/library/Zend/Service/Akismet/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Akismet/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Akismet\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/AbstractAmazon.php b/library/Zend/Service/Amazon/AbstractAmazon.php
index 09c5c14d36e..bb41b43b2a0 100644
--- a/library/Zend/Service/Amazon/AbstractAmazon.php
+++ b/library/Zend/Service/Amazon/AbstractAmazon.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAmazon extends \Zend\Service\AbstractService
 {
@@ -190,4 +186,4 @@ public function getRequestIsoDate()
         //DateTimeZone UTC
         return $date->get('Y-m-d\TH:i:s.000\Z'); //DATE_ISO8601 is not compatible with S3
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Amazon/Accessories.php b/library/Zend/Service/Amazon/Accessories.php
index 510a6c9a27c..f66103872eb 100644
--- a/library/Zend/Service/Amazon/Accessories.php
+++ b/library/Zend/Service/Amazon/Accessories.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Accessories
 {
diff --git a/library/Zend/Service/Amazon/Amazon.php b/library/Zend/Service/Amazon/Amazon.php
index cda6749b53b..c4e76938742 100644
--- a/library/Zend/Service/Amazon/Amazon.php
+++ b/library/Zend/Service/Amazon/Amazon.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Amazon
 {
diff --git a/library/Zend/Service/Amazon/Authentication/AbstractAuthentication.php b/library/Zend/Service/Amazon/Authentication/AbstractAuthentication.php
index 18990a9c75b..d7bf3be2bf8 100644
--- a/library/Zend/Service/Amazon/Authentication/AbstractAuthentication.php
+++ b/library/Zend/Service/Amazon/Authentication/AbstractAuthentication.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Authentication;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAuthentication
 {
diff --git a/library/Zend/Service/Amazon/Authentication/Exception/ExceptionInterface.php b/library/Zend/Service/Amazon/Authentication/Exception/ExceptionInterface.php
index 594e0b323d7..8874df9d232 100644
--- a/library/Zend/Service/Amazon/Authentication/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Amazon/Authentication/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Authentication\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception\ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Authentication/Exception/InvalidArgumentException.php b/library/Zend/Service/Amazon/Authentication/Exception/InvalidArgumentException.php
index 4bbe49af209..c6c8502f012 100644
--- a/library/Zend/Service/Amazon/Authentication/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Amazon/Authentication/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Authentication\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Authentication/Exception/RuntimeException.php b/library/Zend/Service/Amazon/Authentication/Exception/RuntimeException.php
index 717826a0972..0b11e42c0e3 100644
--- a/library/Zend/Service/Amazon/Authentication/Exception/RuntimeException.php
+++ b/library/Zend/Service/Amazon/Authentication/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Authentication\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Authentication/S3.php b/library/Zend/Service/Amazon/Authentication/S3.php
index 238af4073d8..0103fea9a3b 100644
--- a/library/Zend/Service/Amazon/Authentication/S3.php
+++ b/library/Zend/Service/Amazon/Authentication/S3.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Authentication;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class S3 extends AbstractAuthentication
 {
diff --git a/library/Zend/Service/Amazon/Authentication/V1.php b/library/Zend/Service/Amazon/Authentication/V1.php
index 0e0c61a264b..1089d53a26e 100644
--- a/library/Zend/Service/Amazon/Authentication/V1.php
+++ b/library/Zend/Service/Amazon/Authentication/V1.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Authentication;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class V1 extends AbstractAuthentication
 {
diff --git a/library/Zend/Service/Amazon/Authentication/V2.php b/library/Zend/Service/Amazon/Authentication/V2.php
index 84cd8c15b3f..b6e503d6295 100644
--- a/library/Zend/Service/Amazon/Authentication/V2.php
+++ b/library/Zend/Service/Amazon/Authentication/V2.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Authentication;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Authentication
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class V2 extends AbstractAuthentication
 {
diff --git a/library/Zend/Service/Amazon/CustomerReview.php b/library/Zend/Service/Amazon/CustomerReview.php
index e3c15784490..1e06acce90d 100644
--- a/library/Zend/Service/Amazon/CustomerReview.php
+++ b/library/Zend/Service/Amazon/CustomerReview.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CustomerReview
 {
diff --git a/library/Zend/Service/Amazon/Ec2/AbstractEc2.php b/library/Zend/Service/Amazon/Ec2/AbstractEc2.php
index 1cef46a8cf9..f94433b16ce 100644
--- a/library/Zend/Service/Amazon/Ec2/AbstractEc2.php
+++ b/library/Zend/Service/Amazon/Ec2/AbstractEc2.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractEc2 extends Amazon\AbstractAmazon
 {
diff --git a/library/Zend/Service/Amazon/Ec2/AvailabilityZones.php b/library/Zend/Service/Amazon/Ec2/AvailabilityZones.php
index 264ae6bb380..f97cc3e85fe 100644
--- a/library/Zend/Service/Amazon/Ec2/AvailabilityZones.php
+++ b/library/Zend/Service/Amazon/Ec2/AvailabilityZones.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AvailabilityZones extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/CloudWatch.php b/library/Zend/Service/Amazon/Ec2/CloudWatch.php
index 1c36867ab5d..7c973d32fba 100644
--- a/library/Zend/Service/Amazon/Ec2/CloudWatch.php
+++ b/library/Zend/Service/Amazon/Ec2/CloudWatch.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CloudWatch extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Ebs.php b/library/Zend/Service/Amazon/Ec2/Ebs.php
index bf7843fe3e7..1e8ea3044e9 100644
--- a/library/Zend/Service/Amazon/Ec2/Ebs.php
+++ b/library/Zend/Service/Amazon/Ec2/Ebs.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ebs extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Ec2.php b/library/Zend/Service/Amazon/Ec2/Ec2.php
index c4696aa3072..b72d85e5723 100644
--- a/library/Zend/Service/Amazon/Ec2/Ec2.php
+++ b/library/Zend/Service/Amazon/Ec2/Ec2.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ec2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/ElasticIp.php b/library/Zend/Service/Amazon/Ec2/ElasticIp.php
index 355c611238e..f7fdba3f948 100644
--- a/library/Zend/Service/Amazon/Ec2/ElasticIp.php
+++ b/library/Zend/Service/Amazon/Ec2/ElasticIp.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ElasticIp extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Exception/ExceptionInterface.php b/library/Zend/Service/Amazon/Ec2/Exception/ExceptionInterface.php
index 99f1651238d..9238f295191 100644
--- a/library/Zend/Service/Amazon/Ec2/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Amazon/Ec2/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception\ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Exception/InvalidArgumentException.php b/library/Zend/Service/Amazon/Ec2/Exception/InvalidArgumentException.php
index 5c090104994..e6e4b1066b7 100644
--- a/library/Zend/Service/Amazon/Ec2/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Amazon/Ec2/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Exception/RuntimeException.php b/library/Zend/Service/Amazon/Ec2/Exception/RuntimeException.php
index bdf74b6d148..db17c67fa09 100644
--- a/library/Zend/Service/Amazon/Ec2/Exception/RuntimeException.php
+++ b/library/Zend/Service/Amazon/Ec2/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Image.php b/library/Zend/Service/Amazon/Ec2/Image.php
index 19f785be248..871f7cdab97 100644
--- a/library/Zend/Service/Amazon/Ec2/Image.php
+++ b/library/Zend/Service/Amazon/Ec2/Image.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Image extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Instance.php b/library/Zend/Service/Amazon/Ec2/Instance.php
index 0a084e4e583..68664933a83 100644
--- a/library/Zend/Service/Amazon/Ec2/Instance.php
+++ b/library/Zend/Service/Amazon/Ec2/Instance.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Instance extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Keypair.php b/library/Zend/Service/Amazon/Ec2/Keypair.php
index 71f9b4808ee..007899de4ef 100644
--- a/library/Zend/Service/Amazon/Ec2/Keypair.php
+++ b/library/Zend/Service/Amazon/Ec2/Keypair.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Keypair extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Region.php b/library/Zend/Service/Amazon/Ec2/Region.php
index daad4504613..12545594722 100644
--- a/library/Zend/Service/Amazon/Ec2/Region.php
+++ b/library/Zend/Service/Amazon/Ec2/Region.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Region extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/ReservedInstance.php b/library/Zend/Service/Amazon/Ec2/ReservedInstance.php
index 8aa0d3552ce..bb7c1caec64 100644
--- a/library/Zend/Service/Amazon/Ec2/ReservedInstance.php
+++ b/library/Zend/Service/Amazon/Ec2/ReservedInstance.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReservedInstance extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/Response.php b/library/Zend/Service/Amazon/Ec2/Response.php
index a1a80056c0d..58e62d4a381 100644
--- a/library/Zend/Service/Amazon/Ec2/Response.php
+++ b/library/Zend/Service/Amazon/Ec2/Response.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Response
 {
diff --git a/library/Zend/Service/Amazon/Ec2/SecurityGroups.php b/library/Zend/Service/Amazon/Ec2/SecurityGroups.php
index d0654a31109..692b851d1d0 100644
--- a/library/Zend/Service/Amazon/Ec2/SecurityGroups.php
+++ b/library/Zend/Service/Amazon/Ec2/SecurityGroups.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SecurityGroups extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/Ec2/WindowsInstance.php b/library/Zend/Service/Amazon/Ec2/WindowsInstance.php
index ac4777da714..a52a3944943 100644
--- a/library/Zend/Service/Amazon/Ec2/WindowsInstance.php
+++ b/library/Zend/Service/Amazon/Ec2/WindowsInstance.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Ec2;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WindowsInstance extends AbstractEc2
 {
diff --git a/library/Zend/Service/Amazon/EditorialReview.php b/library/Zend/Service/Amazon/EditorialReview.php
index 012c1f07f7b..ea554e79479 100644
--- a/library/Zend/Service/Amazon/EditorialReview.php
+++ b/library/Zend/Service/Amazon/EditorialReview.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EditorialReview
 {
diff --git a/library/Zend/Service/Amazon/Exception/ExceptionInterface.php b/library/Zend/Service/Amazon/Exception/ExceptionInterface.php
index 6460ed46c41..39a348dc212 100644
--- a/library/Zend/Service/Amazon/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Amazon/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Exception/InvalidArgumentException.php b/library/Zend/Service/Amazon/Exception/InvalidArgumentException.php
index e70452abbb0..ab6587efb9b 100644
--- a/library/Zend/Service/Amazon/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Amazon/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Exception/OutOfBoundsException.php b/library/Zend/Service/Amazon/Exception/OutOfBoundsException.php
index 3a6a8e3bf64..bd807ee46ae 100644
--- a/library/Zend/Service/Amazon/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/Amazon/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Exception/RuntimeException.php b/library/Zend/Service/Amazon/Exception/RuntimeException.php
index de5aded6e04..8e210f09960 100644
--- a/library/Zend/Service/Amazon/Exception/RuntimeException.php
+++ b/library/Zend/Service/Amazon/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Image.php b/library/Zend/Service/Amazon/Image.php
index a327c765019..6351979c683 100644
--- a/library/Zend/Service/Amazon/Image.php
+++ b/library/Zend/Service/Amazon/Image.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Image
 {
diff --git a/library/Zend/Service/Amazon/Item.php b/library/Zend/Service/Amazon/Item.php
index 2f302fa8f3a..2ac2860cecc 100644
--- a/library/Zend/Service/Amazon/Item.php
+++ b/library/Zend/Service/Amazon/Item.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Item
 {
diff --git a/library/Zend/Service/Amazon/ListmaniaList.php b/library/Zend/Service/Amazon/ListmaniaList.php
index b4f7138b9da..fced984b031 100644
--- a/library/Zend/Service/Amazon/ListmaniaList.php
+++ b/library/Zend/Service/Amazon/ListmaniaList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ListmaniaList
 {
diff --git a/library/Zend/Service/Amazon/Offer.php b/library/Zend/Service/Amazon/Offer.php
index a5988e2b653..82648a0d7e9 100644
--- a/library/Zend/Service/Amazon/Offer.php
+++ b/library/Zend/Service/Amazon/Offer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Offer
 {
diff --git a/library/Zend/Service/Amazon/OfferSet.php b/library/Zend/Service/Amazon/OfferSet.php
index 039c4fcea6b..0f15d7a29c6 100644
--- a/library/Zend/Service/Amazon/OfferSet.php
+++ b/library/Zend/Service/Amazon/OfferSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OfferSet
 {
diff --git a/library/Zend/Service/Amazon/Query.php b/library/Zend/Service/Amazon/Query.php
index b4b2fe88be9..94590207f6e 100644
--- a/library/Zend/Service/Amazon/Query.php
+++ b/library/Zend/Service/Amazon/Query.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Query extends Amazon
 {
diff --git a/library/Zend/Service/Amazon/ResultSet.php b/library/Zend/Service/Amazon/ResultSet.php
index 6752af4ac1b..a83688aee00 100644
--- a/library/Zend/Service/Amazon/ResultSet.php
+++ b/library/Zend/Service/Amazon/ResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ResultSet implements \SeekableIterator
 {
diff --git a/library/Zend/Service/Amazon/S3/Exception/ExceptionInterface.php b/library/Zend/Service/Amazon/S3/Exception/ExceptionInterface.php
index e4607dd183f..44456a25e2a 100644
--- a/library/Zend/Service/Amazon/S3/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Amazon/S3/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\S3\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception\ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/S3/Exception/InvalidArgumentException.php b/library/Zend/Service/Amazon/S3/Exception/InvalidArgumentException.php
index 5d5b7c29f29..4c4a4f35200 100644
--- a/library/Zend/Service/Amazon/S3/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Amazon/S3/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\S3\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/S3/Exception/RuntimeException.php b/library/Zend/Service/Amazon/S3/Exception/RuntimeException.php
index 2bb57abc15b..e83ba336d87 100644
--- a/library/Zend/Service/Amazon/S3/Exception/RuntimeException.php
+++ b/library/Zend/Service/Amazon/S3/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\S3\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/S3/S3.php b/library/Zend/Service/Amazon/S3/S3.php
index 70378bfb077..129fd4930e1 100644
--- a/library/Zend/Service/Amazon/S3/S3.php
+++ b/library/Zend/Service/Amazon/S3/S3.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\S3;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://docs.amazonwebservices.com/AmazonS3/2006-03-01/
  */
 class S3 extends \Zend\Service\Amazon\AbstractAmazon
diff --git a/library/Zend/Service/Amazon/S3/Stream.php b/library/Zend/Service/Amazon/S3/Stream.php
index c47a29c85c8..2ebe0e63965 100644
--- a/library/Zend/Service/Amazon/S3/Stream.php
+++ b/library/Zend/Service/Amazon/S3/Stream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\S3;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Stream
 {
diff --git a/library/Zend/Service/Amazon/SimilarProduct.php b/library/Zend/Service/Amazon/SimilarProduct.php
index 95c4302dff5..d31ea8b0bf2 100644
--- a/library/Zend/Service/Amazon/SimilarProduct.php
+++ b/library/Zend/Service/Amazon/SimilarProduct.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimilarProduct
 {
diff --git a/library/Zend/Service/Amazon/SimpleDb/Attribute.php b/library/Zend/Service/Amazon/SimpleDb/Attribute.php
index f0d7bbde1f2..0b2e21f4738 100644
--- a/library/Zend/Service/Amazon/SimpleDb/Attribute.php
+++ b/library/Zend/Service/Amazon/SimpleDb/Attribute.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id: Response.php 17539 2009-08-10 22:51:26Z mikaelkael $
  */
 
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Attribute
 {
diff --git a/library/Zend/Service/Amazon/SimpleDb/Exception/ExceptionInterface.php b/library/Zend/Service/Amazon/SimpleDb/Exception/ExceptionInterface.php
index 5f92060a286..357a91c8d6d 100644
--- a/library/Zend/Service/Amazon/SimpleDb/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Amazon/SimpleDb/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\SimpleDb\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception\ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/SimpleDb/Exception/InvalidArgumentException.php b/library/Zend/Service/Amazon/SimpleDb/Exception/InvalidArgumentException.php
index 8d8278b266e..1ec1d1ab698 100644
--- a/library/Zend/Service/Amazon/SimpleDb/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Amazon/SimpleDb/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\SimpleDb\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/SimpleDb/Exception/RuntimeException.php b/library/Zend/Service/Amazon/SimpleDb/Exception/RuntimeException.php
index 51f5ffbc3b5..be880898dfc 100644
--- a/library/Zend/Service/Amazon/SimpleDb/Exception/RuntimeException.php
+++ b/library/Zend/Service/Amazon/SimpleDb/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\SimpleDb\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/SimpleDb/Page.php b/library/Zend/Service/Amazon/SimpleDb/Page.php
index 7acf16edeaa..d1c13ebea66 100644
--- a/library/Zend/Service/Amazon/SimpleDb/Page.php
+++ b/library/Zend/Service/Amazon/SimpleDb/Page.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\SimpleDb;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Page
 {
diff --git a/library/Zend/Service/Amazon/SimpleDb/Response.php b/library/Zend/Service/Amazon/SimpleDb/Response.php
index 89dff9f5b95..968b04b8a9e 100644
--- a/library/Zend/Service/Amazon/SimpleDb/Response.php
+++ b/library/Zend/Service/Amazon/SimpleDb/Response.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\SimpleDb;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Response
 {
diff --git a/library/Zend/Service/Amazon/SimpleDb/SimpleDb.php b/library/Zend/Service/Amazon/SimpleDb/SimpleDb.php
index 9166839f9a4..779746f32fd 100644
--- a/library/Zend/Service/Amazon/SimpleDb/SimpleDb.php
+++ b/library/Zend/Service/Amazon/SimpleDb/SimpleDb.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\SimpleDb;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage SimpleDb
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleDb extends \Zend\Service\Amazon\AbstractAmazon
 {
diff --git a/library/Zend/Service/Amazon/Sqs/Exception/ExceptionInterface.php b/library/Zend/Service/Amazon/Sqs/Exception/ExceptionInterface.php
index b0ba7bf8936..fc3c0882b59 100644
--- a/library/Zend/Service/Amazon/Sqs/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Amazon/Sqs/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Sqs\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception\ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Sqs/Exception/InvalidArgumentException.php b/library/Zend/Service/Amazon/Sqs/Exception/InvalidArgumentException.php
index e4d3a00bc33..331853d8a2f 100644
--- a/library/Zend/Service/Amazon/Sqs/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Amazon/Sqs/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Sqs\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Sqs/Exception/RuntimeException.php b/library/Zend/Service/Amazon/Sqs/Exception/RuntimeException.php
index 49e9fdc912c..a883db5439b 100644
--- a/library/Zend/Service/Amazon/Sqs/Exception/RuntimeException.php
+++ b/library/Zend/Service/Amazon/Sqs/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Sqs\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Amazon/Sqs/Sqs.php b/library/Zend/Service/Amazon/Sqs/Sqs.php
index 75914979616..b24671132db 100644
--- a/library/Zend/Service/Amazon/Sqs/Sqs.php
+++ b/library/Zend/Service/Amazon/Sqs/Sqs.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Amazon\Sqs;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://aws.amazon.com/sqs/ Amazon Simple Queue Service
  */
 class Sqs extends \Zend\Service\Amazon\AbstractAmazon
diff --git a/library/Zend/Service/Audioscrobbler/Audioscrobbler.php b/library/Zend/Service/Audioscrobbler/Audioscrobbler.php
index 9c4fadbb5eb..129a8bef26c 100644
--- a/library/Zend/Service/Audioscrobbler/Audioscrobbler.php
+++ b/library/Zend/Service/Audioscrobbler/Audioscrobbler.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Audioscrobbler;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Audioscrobbler extends AbstractService
 {
diff --git a/library/Zend/Service/Audioscrobbler/Exception/BadMethodCallException.php b/library/Zend/Service/Audioscrobbler/Exception/BadMethodCallException.php
index fa2ca9b07d5..764eac992cb 100644
--- a/library/Zend/Service/Audioscrobbler/Exception/BadMethodCallException.php
+++ b/library/Zend/Service/Audioscrobbler/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Audioscrobbler\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Audioscrobbler/Exception/ExceptionInterface.php b/library/Zend/Service/Audioscrobbler/Exception/ExceptionInterface.php
index daf83f2164b..c579d818935 100644
--- a/library/Zend/Service/Audioscrobbler/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Audioscrobbler/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/Audioscrobbler/Exception/InvalidArgumentException.php b/library/Zend/Service/Audioscrobbler/Exception/InvalidArgumentException.php
index 7f1d567914a..f82e52d40ad 100644
--- a/library/Zend/Service/Audioscrobbler/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Audioscrobbler/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Audioscrobbler\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Audioscrobbler/Exception/RuntimeException.php b/library/Zend/Service/Audioscrobbler/Exception/RuntimeException.php
index 887e954d0b9..c89a8976e0d 100644
--- a/library/Zend/Service/Audioscrobbler/Exception/RuntimeException.php
+++ b/library/Zend/Service/Audioscrobbler/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Audioscrobbler\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Delicious/Delicious.php b/library/Zend/Service/Delicious/Delicious.php
index cf1c9d82c72..0a5749fee2e 100644
--- a/library/Zend/Service/Delicious/Delicious.php
+++ b/library/Zend/Service/Delicious/Delicious.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Delicious;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Delicious
 {
diff --git a/library/Zend/Service/Delicious/Exception.php b/library/Zend/Service/Delicious/Exception.php
index b27d1157767..976526699a8 100644
--- a/library/Zend/Service/Delicious/Exception.php
+++ b/library/Zend/Service/Delicious/Exception.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Delicious;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Exception extends \Exception
 {}
diff --git a/library/Zend/Service/Delicious/Post.php b/library/Zend/Service/Delicious/Post.php
index fcd8d4bf4a9..31a78098be9 100644
--- a/library/Zend/Service/Delicious/Post.php
+++ b/library/Zend/Service/Delicious/Post.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Delicious;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Post extends SimplePost
 {
diff --git a/library/Zend/Service/Delicious/PostList.php b/library/Zend/Service/Delicious/PostList.php
index c22583a76de..33f226efe14 100644
--- a/library/Zend/Service/Delicious/PostList.php
+++ b/library/Zend/Service/Delicious/PostList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Delicious;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PostList implements \Countable, \Iterator, \ArrayAccess
 {
diff --git a/library/Zend/Service/Delicious/SimplePost.php b/library/Zend/Service/Delicious/SimplePost.php
index e9ff8c21ba7..c3d7af6f9a9 100644
--- a/library/Zend/Service/Delicious/SimplePost.php
+++ b/library/Zend/Service/Delicious/SimplePost.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Delicious;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimplePost
 {
diff --git a/library/Zend/Service/DeveloperGarden/BaseUserService.php b/library/Zend/Service/DeveloperGarden/BaseUserService.php
index 3163035dbdc..ff637a8ddaf 100644
--- a/library/Zend/Service/DeveloperGarden/BaseUserService.php
+++ b/library/Zend/Service/DeveloperGarden/BaseUserService.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_BaseUserService extends Zend_Service_DeveloperGarden_Client_AbstractClient
 {
diff --git a/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php b/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
index 9203c4ff483..fdb4b0c2aee 100644
--- a/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
+++ b/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_BaseUserService_AccountBalance
 {
diff --git a/library/Zend/Service/DeveloperGarden/Client/AbstractClient.php b/library/Zend/Service/DeveloperGarden/Client/AbstractClient.php
index 516d6b3e9fe..358ef174fd0 100644
--- a/library/Zend/Service/DeveloperGarden/Client/AbstractClient.php
+++ b/library/Zend/Service/DeveloperGarden/Client/AbstractClient.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Client_AbstractClient
 {
diff --git a/library/Zend/Service/DeveloperGarden/Client/Exception.php b/library/Zend/Service/DeveloperGarden/Client/Exception.php
index 2dce27f5d3b..ac165d882dd 100644
--- a/library/Zend/Service/DeveloperGarden/Client/Exception.php
+++ b/library/Zend/Service/DeveloperGarden/Client/Exception.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Client_Exception extends Zend_Service_DeveloperGarden_Exception
 {
diff --git a/library/Zend/Service/DeveloperGarden/Client/Soap.php b/library/Zend/Service/DeveloperGarden/Client/Soap.php
index 2ae4993092b..d450f3de045 100644
--- a/library/Zend/Service/DeveloperGarden/Client/Soap.php
+++ b/library/Zend/Service/DeveloperGarden/Client/Soap.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Client_Soap extends Zend\Soap\Client
 {
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall.php b/library/Zend/Service/DeveloperGarden/ConferenceCall.php
index 4ae8ba346b2..26fc9274cc5 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall
     extends Zend_Service_DeveloperGarden_Client_AbstractClient
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
index f54562aaf79..ccc186ea45f 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
 {
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
index 53963913ea4..6c9a55a52f7 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
 {
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
index 45e2f179e14..ad8d5ee0e31 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
 {
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
index bf345938f9b..b1034258c3e 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall_Exception extends Zend_Service_DeveloperGarden_Exception
 {
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
index e23b28e12c1..e3159f76e21 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall_Participant
 {
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
index b8d8917a9ba..b5a1696ec25 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
 {
diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
index cdae1e4cc75..70dc7fdf842 100644
--- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
+++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
 {
diff --git a/library/Zend/Service/DeveloperGarden/Credential.php b/library/Zend/Service/DeveloperGarden/Credential.php
index 0cd0341aa6e..045d90206bb 100644
--- a/library/Zend/Service/DeveloperGarden/Credential.php
+++ b/library/Zend/Service/DeveloperGarden/Credential.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Credential
 {
diff --git a/library/Zend/Service/DeveloperGarden/Exception.php b/library/Zend/Service/DeveloperGarden/Exception.php
index 38580d7be20..2ddc6263605 100644
--- a/library/Zend/Service/DeveloperGarden/Exception.php
+++ b/library/Zend/Service/DeveloperGarden/Exception.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Exception extends \Exception
 {
diff --git a/library/Zend/Service/DeveloperGarden/IpLocation.php b/library/Zend/Service/DeveloperGarden/IpLocation.php
index ad30716658f..17af7f53d46 100644
--- a/library/Zend/Service/DeveloperGarden/IpLocation.php
+++ b/library/Zend/Service/DeveloperGarden/IpLocation.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_IpLocation 
     extends Zend_Service_DeveloperGarden_Client_AbstractClient
diff --git a/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php b/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
index a0473a2a2aa..f1267610ffa 100644
--- a/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
+++ b/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_IpLocation_IpAddress
 {
diff --git a/library/Zend/Service/DeveloperGarden/LocalSearch.php b/library/Zend/Service/DeveloperGarden/LocalSearch.php
index 4d8004f25ac..1fae9ca5f27 100644
--- a/library/Zend/Service/DeveloperGarden/LocalSearch.php
+++ b/library/Zend/Service/DeveloperGarden/LocalSearch.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_LocalSearch
     extends Zend_Service_DeveloperGarden_Client_AbstractClient
diff --git a/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php b/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
index 0d60563e76e..83cad7da474 100644
--- a/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
+++ b/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_LocalSearch_Exception extends Zend_Service_DeveloperGarden_Exception
 {
diff --git a/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php b/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
index 2060a5ada2e..8c6a5e1d857 100644
--- a/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
+++ b/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
 {
diff --git a/library/Zend/Service/DeveloperGarden/Request/AbstractRequest.php b/library/Zend/Service/DeveloperGarden/Request/AbstractRequest.php
index a1c4416d877..441a09e94d0 100644
--- a/library/Zend/Service/DeveloperGarden/Request/AbstractRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/AbstractRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Request_AbstractRequest
 {
diff --git a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
index 0fb1abb488d..ef372223d5b 100644
--- a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
+++ b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool
 {
diff --git a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
index 1abc3dae26f..982fce3b643 100644
--- a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
+++ b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_BaseUserService_GetAccountBalance
 {
diff --git a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
index a3ba4b0549a..e52d5f61b6f 100644
--- a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
+++ b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation
 {
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
index 0bb8bc88e14..64134c470f9 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
index 2d90b488eb2..9fedc2c3a56 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
index 99b1d9d6891..92ecea7e9e9 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
index 44e2fa9e4e2..1135831fed3 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
index 58e347ec4af..9b028a964c0 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
index fff358c9704..49ade38aa3e 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
index 19a51ec38c9..ec7c65232e7 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
index 9c2a6c382e2..89e90414dc9 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
index 1a97452f649..31128c3abcc 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
index f464a5b7a23..0902d18bc5c 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
index 594f36e6da6..059540d064b 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
index 1db87fe3137..1e18b4d0479 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
index 9482df82924..0c5887285f2 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
index 3a7361112ed..774c79021ef 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
index a96ea803e53..7e68d477b9c 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
index a4bdfa924d7..d6a3ec85cce 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
index 1f13368562f..72d337cb3b2 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
index f70f763795f..4bbaefc87d6 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
index 20b71e20d45..a9bb32c81e2 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
index 5edeac6403a..7c7fd9fc1f9 100644
--- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/Exception.php b/library/Zend/Service/DeveloperGarden/Request/Exception.php
index 075d17c340d..95ba888deef 100644
--- a/library/Zend/Service/DeveloperGarden/Request/Exception.php
+++ b/library/Zend/Service/DeveloperGarden/Request/Exception.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_Exception
     extends Zend_Service_DeveloperGarden_Exception
diff --git a/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php b/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
index 2796ff1d9af..1db3b5e9f15 100644
--- a/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php b/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
index d0a010eef9a..0dd361f8655 100644
--- a/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
+++ b/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/SendSms/AbstractSendSms.php b/library/Zend/Service/DeveloperGarden/Request/SendSms/AbstractSendSms.php
index d082111997c..d18779ee313 100644
--- a/library/Zend/Service/DeveloperGarden/Request/SendSms/AbstractSendSms.php
+++ b/library/Zend/Service/DeveloperGarden/Request/SendSms/AbstractSendSms.php
@@ -16,17 +16,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Request_SendSms_AbstractSendSms
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
index 613329dbbdc..921823cb1ea 100644
--- a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
+++ b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS
     extends Zend_Service_DeveloperGarden_Request_SendSms_AbstractSendSms
diff --git a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
index f7e1584b743..afd0b00782b 100644
--- a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
+++ b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_SendSms_SendSMS
     extends Zend_Service_DeveloperGarden_Request_SendSms_AbstractSendSms
diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
index 1b460268d1b..5adf937992c 100644
--- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
+++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_SmsValidation_GetValidatedNumbers
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
index b41bff116d7..aa5d45d75d1 100644
--- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
+++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_SmsValidation_Invalidate
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
index 6d5aee02714..30d37bc3e84 100644
--- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
+++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeyword
     extends Zend_Service_DeveloperGarden_Request_SendSms_AbstractSendSms
diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
index 0693dd94748..8d195e74b48 100644
--- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
+++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/AbstractVoiceButler.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/AbstractVoiceButler.php
index aa39fa602b8..0257a484da0 100644
--- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/AbstractVoiceButler.php
+++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/AbstractVoiceButler.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Request_VoiceButler_AbstractVoiceButler
     extends Zend_Service_DeveloperGarden_Request_AbstractRequest
diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
index 2c1f909617b..0e975411d8c 100644
--- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
+++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
     extends Zend_Service_DeveloperGarden_Request_VoiceButler_AbstractVoiceButler
diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
index 51c1d63f63b..9567b167d0f 100644
--- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
+++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
     extends Zend_Service_DeveloperGarden_Request_VoiceButler_AbstractVoiceButler
diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
index 97a81c68866..78ac6ae2a70 100644
--- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
+++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced
     extends Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
index cfed9366146..a0b680a93fa 100644
--- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
+++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall
     extends Zend_Service_DeveloperGarden_Request_VoiceButler_AbstractVoiceButler
diff --git a/library/Zend/Service/DeveloperGarden/Response/AbstractResponse.php b/library/Zend/Service/DeveloperGarden/Response/AbstractResponse.php
index 521682f2b11..6e04f110d40 100644
--- a/library/Zend/Service/DeveloperGarden/Response/AbstractResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/AbstractResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Response_AbstractResponse
 {
diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseType.php b/library/Zend/Service/DeveloperGarden/Response/BaseType.php
index b6b52851b8d..711b5f30a60 100644
--- a/library/Zend/Service/DeveloperGarden/Response/BaseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/BaseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_BaseType
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
index 0614215d696..dfeaea129fb 100644
--- a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
index 7c0e7b34c22..e4cc1f9929d 100644
--- a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
index 7ff6e5ed35f..5eb4930fa36 100644
--- a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AbstractConferenceCall.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AbstractConferenceCall.php
index da0ed658411..4296030f6d9 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AbstractConferenceCall.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AbstractConferenceCall.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
index bcc89a27f09..5f81004e59d 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
index 52bd23ba39b..ccbed5efe1b 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
index 6ed335b3b73..2688bbc9b81 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
index ed17beaf132..e3587067f38 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
index 68f2436c972..7c915c0ed32 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
index 3a056fafe0c..e9857a848eb 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
index 1efc5d51d2b..6f3c34de618 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
index 7efe5d85f61..c940c326843 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
index bb3151d1c29..17bfa36207d 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
index 83ed8ef4e61..d794ae8d989 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
index 50c3d5c4a39..02a0008b969 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
index d5e6efdaae2..97201dcb66d 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
index 8336a079c1d..566e41e39e2 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
index 1766dde52f4..6bb9b0c5c5c 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
index 39f7f56ec7e..1c7c909dec3 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
index c700a216c1e..84685da92ca 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
index 591732b0dc1..56b727cb655 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
index b01bdfbe0bb..437206e854e 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
index ba9480bcb12..609dad066e6 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
index a40aa065214..e8acc1a5a33 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
index 45ab7d0f3ec..fb62cbc15d0 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
index b39418d49fe..3aef3d75127 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
index b6f35f14839..04df766e7df 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
index c61ff9c24d6..f0bb831807f 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
index b7ea62e676c..5e3696c25ab 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
index ffdb1c0cde3..9f43b688f78 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateParticipantResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
index 92456abdc13..7bb0e7aae17 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
index 74d3dd8cc24..432133b8ed9 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveParticipantResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
index 5a63aacced7..7b9e9e0ecff 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
index d67f33fa046..f8d046c22d1 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateParticipantResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
index 1b54f5be24d..046b0783a6c 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
index ece749292a3..cf28c1b77aa 100644
--- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateParticipantResponse
     extends Zend_Service_DeveloperGarden_Response_ConferenceCall_AbstractConferenceCall
diff --git a/library/Zend/Service/DeveloperGarden/Response/Exception.php b/library/Zend/Service/DeveloperGarden/Response/Exception.php
index 4b25e19f448..68bac40f732 100644
--- a/library/Zend/Service/DeveloperGarden/Response/Exception.php
+++ b/library/Zend/Service/DeveloperGarden/Response/Exception.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_Exception
     extends Zend_Service_DeveloperGarden_Exception
diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
index b706dff5c06..c13ceb943b1 100644
--- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_IpLocation_CityType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
index 260fe8c5b04..5076a5da606 100644
--- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
index 2f293e1196c..48057d13a2e 100644
--- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
index dd8fbe62f7b..d5863b2ac86 100644
--- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
index fec314b5c6b..625910c5a80 100644
--- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
index 2b84858c604..a37517416e2 100644
--- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
index 4866ee9ee3b..e009ce91197 100644
--- a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponse
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
index 90412851253..dbd4d042b72 100644
--- a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
+++ b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
index 66799cbf3b9..1c8d553e44d 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Exception
     extends Zend_Service_DeveloperGarden_Response_Exception
diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
index 75532243f59..545179e3f8a 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
index 4d5ab40478e..88b72d2ab02 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
@@ -16,17 +16,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
 {
diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
index 31c5c57d988..1579dd6bd83 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/SendSms/AbstractSendSms.php b/library/Zend/Service/DeveloperGarden/Response/SendSms/AbstractSendSms.php
index d1dcaafb5e6..d20727063e6 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SendSms/AbstractSendSms.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SendSms/AbstractSendSms.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Response_SendSms_AbstractSendSms
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
index 3c615bad9cf..3d631056d06 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SendSms_SendFlashSMSResponse
     extends Zend_Service_DeveloperGarden_Response_SendSms_AbstractSendSms
diff --git a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
index 97cd8b88f3f..ee8e5cd02e2 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SendSms_SendSMSResponse
     extends Zend_Service_DeveloperGarden_Response_SendSms_AbstractSendSms
diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
index 2023d505fc6..e48bfe8aa13 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
index 33c5b8516d0..62d615605be 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
index e284f9a052e..4322c95b055 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SmsValidation_SendValidationKeywordResponse
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
index 9e1d4f6cf1a..ba81f0cd40a 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse
     extends Zend_Service_DeveloperGarden_Response_BaseType
diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
index 81765fabb55..5500c1d3d6a 100644
--- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
+++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
 {
diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/AbstractVoiceButler.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/AbstractVoiceButler.php
index bcac3ce86a9..5784d9ed422 100644
--- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/AbstractVoiceButler.php
+++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/AbstractVoiceButler.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_DeveloperGarden_Response_VoiceButler_AbstractVoiceButler
     extends Zend_Service_DeveloperGarden_Response_AbstractResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
index b29da4c20f3..82b238b18f2 100644
--- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
+++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatus2Response
     extends Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
index 70db1e81384..5193d61188d 100644
--- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
     extends Zend_Service_DeveloperGarden_Response_VoiceButler_AbstractVoiceButler
diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
index 0b9446dc3f2..fe200b1fd83 100644
--- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
     extends Zend_Service_DeveloperGarden_Response_VoiceButler_AbstractVoiceButler
diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
index 0ee86bb94c3..172a2fb290c 100644
--- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse
     extends Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
index e7f17bfebb5..098ec476959 100644
--- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
+++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse
     extends Zend_Service_DeveloperGarden_Response_VoiceButler_AbstractVoiceButler
diff --git a/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php b/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php
index 480b03f253e..64c72964704 100644
--- a/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php
+++ b/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_SecurityTokenServer
     extends Zend_Service_DeveloperGarden_Client_AbstractClient
diff --git a/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php b/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
index 6c5f27ee673..00968f979ab 100644
--- a/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
+++ b/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_SecurityTokenServer_Cache
 {
diff --git a/library/Zend/Service/DeveloperGarden/SendSms.php b/library/Zend/Service/DeveloperGarden/SendSms.php
index 3d7e41c3a2e..4c25a8c61ed 100644
--- a/library/Zend/Service/DeveloperGarden/SendSms.php
+++ b/library/Zend/Service/DeveloperGarden/SendSms.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_SendSms
     extends Zend_Service_DeveloperGarden_Client_AbstractClient
diff --git a/library/Zend/Service/DeveloperGarden/SmsValidation.php b/library/Zend/Service/DeveloperGarden/SmsValidation.php
index e6825028c4f..bdedaeb2979 100644
--- a/library/Zend/Service/DeveloperGarden/SmsValidation.php
+++ b/library/Zend/Service/DeveloperGarden/SmsValidation.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_SmsValidation extends Zend_Service_DeveloperGarden_Client_AbstractClient
 {
diff --git a/library/Zend/Service/DeveloperGarden/VoiceCall.php b/library/Zend/Service/DeveloperGarden/VoiceCall.php
index 5c5d91b5bee..7da104db9f3 100644
--- a/library/Zend/Service/DeveloperGarden/VoiceCall.php
+++ b/library/Zend/Service/DeveloperGarden/VoiceCall.php
@@ -15,17 +15,13 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_DeveloperGarden_VoiceCall
     extends Zend_Service_DeveloperGarden_Client_AbstractClient
diff --git a/library/Zend/Service/Flickr/Exception/DomainException.php b/library/Zend/Service/Flickr/Exception/DomainException.php
index 54c4de4a28e..d6ed48f9393 100644
--- a/library/Zend/Service/Flickr/Exception/DomainException.php
+++ b/library/Zend/Service/Flickr/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr\Exception;
@@ -25,9 +23,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/Exception/ExceptionInterface.php b/library/Zend/Service/Flickr/Exception/ExceptionInterface.php
index 9b6dc455d90..f804d890347 100644
--- a/library/Zend/Service/Flickr/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Flickr/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr\Exception;
@@ -25,9 +23,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/Exception/InvalidArgumentException.php b/library/Zend/Service/Flickr/Exception/InvalidArgumentException.php
index e3edaba4fbf..2e9dcb1922f 100644
--- a/library/Zend/Service/Flickr/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Flickr/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr\Exception;
@@ -25,10 +23,8 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException
         implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/Exception/OutOfBoundsException.php b/library/Zend/Service/Flickr/Exception/OutOfBoundsException.php
index 111f728834c..8c7a1564683 100644
--- a/library/Zend/Service/Flickr/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/Flickr/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr\Exception;
@@ -25,10 +23,8 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException
     implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/Exception/RuntimeException.php b/library/Zend/Service/Flickr/Exception/RuntimeException.php
index 4aad05ea746..c6e126f17ca 100644
--- a/library/Zend/Service/Flickr/Exception/RuntimeException.php
+++ b/library/Zend/Service/Flickr/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr\Exception;
@@ -25,9 +23,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/Flickr.php b/library/Zend/Service/Flickr/Flickr.php
index a36b93e6e98..a32cd6a3daa 100644
--- a/library/Zend/Service/Flickr/Flickr.php
+++ b/library/Zend/Service/Flickr/Flickr.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Flickr
 {
@@ -519,4 +515,4 @@ protected function compareOptions(array $options, array $validOptions)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/Image.php b/library/Zend/Service/Flickr/Image.php
index bcdf3d1e641..acb3fce8397 100644
--- a/library/Zend/Service/Flickr/Image.php
+++ b/library/Zend/Service/Flickr/Image.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Image
 {
@@ -72,4 +68,4 @@ public function __construct(DOMElement $image)
         $this->height   = (int)$image->getAttribute('height');
         $this->width    = (int)$image->getAttribute('width');
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/Result.php b/library/Zend/Service/Flickr/Result.php
index 0491b2c2574..a8e41b21106 100644
--- a/library/Zend/Service/Flickr/Result.php
+++ b/library/Zend/Service/Flickr/Result.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Result
 {
@@ -193,4 +189,4 @@ public function __construct(DOMElement $image, Flickr $flickr)
             $this->$k = $v;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/Flickr/ResultSet.php b/library/Zend/Service/Flickr/ResultSet.php
index b816f28324d..85b39315719 100644
--- a/library/Zend/Service/Flickr/ResultSet.php
+++ b/library/Zend/Service/Flickr/ResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Flickr;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ResultSet implements SeekableIterator
 {
@@ -182,4 +178,4 @@ public function valid()
     {
         return null !== $this->results && $this->currentIndex < $this->results->length;
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Service/GoGrid/AbstractGoGrid.php b/library/Zend/Service/GoGrid/AbstractGoGrid.php
index 83ccfd9d356..6397722a372 100644
--- a/library/Zend/Service/GoGrid/AbstractGoGrid.php
+++ b/library/Zend/Service/GoGrid/AbstractGoGrid.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid;
diff --git a/library/Zend/Service/GoGrid/Exception/ExceptionInterface.php b/library/Zend/Service/GoGrid/Exception/ExceptionInterface.php
index 037bae50185..ec799820f08 100644
--- a/library/Zend/Service/GoGrid/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/GoGrid/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/GoGrid/Exception/InvalidArgumentException.php b/library/Zend/Service/GoGrid/Exception/InvalidArgumentException.php
index 21bfb4a6af9..7f46f236fdd 100644
--- a/library/Zend/Service/GoGrid/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/GoGrid/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/GoGrid/Exception/OutOfBoundsException.php b/library/Zend/Service/GoGrid/Exception/OutOfBoundsException.php
index 7389735f759..d9db1d8e51d 100644
--- a/library/Zend/Service/GoGrid/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/GoGrid/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/GoGrid/Exception/RuntimeException.php b/library/Zend/Service/GoGrid/Exception/RuntimeException.php
index db5f30dbacd..4a2d9203c40 100644
--- a/library/Zend/Service/GoGrid/Exception/RuntimeException.php
+++ b/library/Zend/Service/GoGrid/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/GoGrid/Job.php b/library/Zend/Service/GoGrid/Job.php
index c6e243c9f1a..82a1b144461 100644
--- a/library/Zend/Service/GoGrid/Job.php
+++ b/library/Zend/Service/GoGrid/Job.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid;
diff --git a/library/Zend/Service/GoGrid/Object.php b/library/Zend/Service/GoGrid/Object.php
index afba4327a7d..73b429cc452 100644
--- a/library/Zend/Service/GoGrid/Object.php
+++ b/library/Zend/Service/GoGrid/Object.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 namespace Zend\Service\GoGrid;
 class Object
diff --git a/library/Zend/Service/GoGrid/ObjectList.php b/library/Zend/Service/GoGrid/ObjectList.php
index 35e9a5c0852..ce26bc08bc4 100644
--- a/library/Zend/Service/GoGrid/ObjectList.php
+++ b/library/Zend/Service/GoGrid/ObjectList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ObjectList implements
     Countable,
diff --git a/library/Zend/Service/GoGrid/Server.php b/library/Zend/Service/GoGrid/Server.php
index 7f325bf2b4a..9eddb40f5b3 100644
--- a/library/Zend/Service/GoGrid/Server.php
+++ b/library/Zend/Service/GoGrid/Server.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage GoGrid
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\GoGrid;
diff --git a/library/Zend/Service/LiveDocx/AbstractLiveDocx.php b/library/Zend/Service/LiveDocx/AbstractLiveDocx.php
old mode 100755
new mode 100644
index 23f0ffbd6e4..a6cdd707c43
--- a/library/Zend/Service/LiveDocx/AbstractLiveDocx.php
+++ b/library/Zend/Service/LiveDocx/AbstractLiveDocx.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\LiveDocx;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractLiveDocx
 {
diff --git a/library/Zend/Service/LiveDocx/Exception/ExceptionInterface.php b/library/Zend/Service/LiveDocx/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index a7296e887cd..ad3b230a178
--- a/library/Zend/Service/LiveDocx/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/LiveDocx/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\LiveDocx\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/LiveDocx/Exception/InvalidArgumentException.php b/library/Zend/Service/LiveDocx/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 30ad8f3f94a..69258773f8a
--- a/library/Zend/Service/LiveDocx/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/LiveDocx/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\LiveDocx\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/LiveDocx/Exception/RuntimeException.php b/library/Zend/Service/LiveDocx/Exception/RuntimeException.php
old mode 100755
new mode 100644
index c45c713ba50..57bdd087317
--- a/library/Zend/Service/LiveDocx/Exception/RuntimeException.php
+++ b/library/Zend/Service/LiveDocx/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\LiveDocx\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/LiveDocx/MailMerge.php b/library/Zend/Service/LiveDocx/MailMerge.php
old mode 100755
new mode 100644
index 7ad6829576b..01511875a21
--- a/library/Zend/Service/LiveDocx/MailMerge.php
+++ b/library/Zend/Service/LiveDocx/MailMerge.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\LiveDocx;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MailMerge extends AbstractLiveDocx
 {
diff --git a/library/Zend/Service/Nirvanix/Context/Base.php b/library/Zend/Service/Nirvanix/Context/Base.php
index bc69f0bf4f2..af1fb2e4dea 100644
--- a/library/Zend/Service/Nirvanix/Context/Base.php
+++ b/library/Zend/Service/Nirvanix/Context/Base.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix\Context;
@@ -37,8 +35,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Base
 {
diff --git a/library/Zend/Service/Nirvanix/Context/Imfs.php b/library/Zend/Service/Nirvanix/Context/Imfs.php
index 77af1ad4985..c81e91bf79f 100644
--- a/library/Zend/Service/Nirvanix/Context/Imfs.php
+++ b/library/Zend/Service/Nirvanix/Context/Imfs.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix\Context;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Imfs extends Base
 {
diff --git a/library/Zend/Service/Nirvanix/Exception/DomainException.php b/library/Zend/Service/Nirvanix/Exception/DomainException.php
index 2b065827cdc..6a1ee94e8e7 100644
--- a/library/Zend/Service/Nirvanix/Exception/DomainException.php
+++ b/library/Zend/Service/Nirvanix/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Nirvanix/Exception/ExceptionInterface.php b/library/Zend/Service/Nirvanix/Exception/ExceptionInterface.php
index 21bd3bdc739..3ea44074de0 100644
--- a/library/Zend/Service/Nirvanix/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Nirvanix/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/Nirvanix/Exception/InvalidArgumentException.php b/library/Zend/Service/Nirvanix/Exception/InvalidArgumentException.php
index e86286e90ac..f7491fb1524 100644
--- a/library/Zend/Service/Nirvanix/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Nirvanix/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Nirvanix/Exception/RuntimeException.php b/library/Zend/Service/Nirvanix/Exception/RuntimeException.php
index dff293fcbff..30c0cbea920 100644
--- a/library/Zend/Service/Nirvanix/Exception/RuntimeException.php
+++ b/library/Zend/Service/Nirvanix/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Nirvanix/Nirvanix.php b/library/Zend/Service/Nirvanix/Nirvanix.php
index 92fbd220983..478e55700a1 100644
--- a/library/Zend/Service/Nirvanix/Nirvanix.php
+++ b/library/Zend/Service/Nirvanix/Nirvanix.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Nirvanix
 {
diff --git a/library/Zend/Service/Nirvanix/Response.php b/library/Zend/Service/Nirvanix/Response.php
index 89605cb7fa0..3a0915f4e77 100644
--- a/library/Zend/Service/Nirvanix/Response.php
+++ b/library/Zend/Service/Nirvanix/Response.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Nirvanix;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Response
 {
diff --git a/library/Zend/Service/Rackspace/AbstractRackspace.php b/library/Zend/Service/Rackspace/AbstractRackspace.php
index 32df05759cf..3b4b4e90243 100644
--- a/library/Zend/Service/Rackspace/AbstractRackspace.php
+++ b/library/Zend/Service/Rackspace/AbstractRackspace.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace;
diff --git a/library/Zend/Service/Rackspace/Exception/ExceptionInterface.php b/library/Zend/Service/Rackspace/Exception/ExceptionInterface.php
index 748f4758f7c..ac4165f19da 100644
--- a/library/Zend/Service/Rackspace/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Rackspace/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend\Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Exception/InvalidArgumentException.php b/library/Zend/Service/Rackspace/Exception/InvalidArgumentException.php
index acae97621ed..97561c85dba 100644
--- a/library/Zend/Service/Rackspace/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Rackspace/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Exception/OutOfBoundsException.php b/library/Zend/Service/Rackspace/Exception/OutOfBoundsException.php
index d6c324da761..9818c3b9a2d 100644
--- a/library/Zend/Service/Rackspace/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/Rackspace/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Exception/RuntimeException.php b/library/Zend/Service/Rackspace/Exception/RuntimeException.php
index f67d5a81ab7..6ed25788d4b 100644
--- a/library/Zend/Service/Rackspace/Exception/RuntimeException.php
+++ b/library/Zend/Service/Rackspace/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Exception;
@@ -24,8 +22,6 @@
 /**
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Files.php b/library/Zend/Service/Rackspace/Files.php
index b4660b3ae83..71ab02eea2d 100644
--- a/library/Zend/Service/Rackspace/Files.php
+++ b/library/Zend/Service/Rackspace/Files.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace;
diff --git a/library/Zend/Service/Rackspace/Files/Container.php b/library/Zend/Service/Rackspace/Files/Container.php
index 4d161413ee4..83ad7fa97f6 100644
--- a/library/Zend/Service/Rackspace/Files/Container.php
+++ b/library/Zend/Service/Rackspace/Files/Container.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files;
diff --git a/library/Zend/Service/Rackspace/Files/ContainerList.php b/library/Zend/Service/Rackspace/Files/ContainerList.php
index 63a66746407..9a68a9417d2 100644
--- a/library/Zend/Service/Rackspace/Files/ContainerList.php
+++ b/library/Zend/Service/Rackspace/Files/ContainerList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ContainerList implements
     Countable,
diff --git a/library/Zend/Service/Rackspace/Files/Exception/ExceptionInterface.php b/library/Zend/Service/Rackspace/Files/Exception/ExceptionInterface.php
index 6cb18c9ee2d..4511adddc53 100644
--- a/library/Zend/Service/Rackspace/Files/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Rackspace/Files/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files\Exception;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend\Service\Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends RackspaceException
 {
diff --git a/library/Zend/Service/Rackspace/Files/Exception/InvalidArgumentException.php b/library/Zend/Service/Rackspace/Files/Exception/InvalidArgumentException.php
index 3ccb7f83937..e3e46629f1a 100644
--- a/library/Zend/Service/Rackspace/Files/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Rackspace/Files/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\Files
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Files/Exception/OutOfBoundsException.php b/library/Zend/Service/Rackspace/Files/Exception/OutOfBoundsException.php
index 41b65593244..6e96161c25e 100644
--- a/library/Zend/Service/Rackspace/Files/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/Rackspace/Files/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\Files
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Files/Exception/RuntimeException.php b/library/Zend/Service/Rackspace/Files/Exception/RuntimeException.php
index c4146242b6d..beb287341de 100644
--- a/library/Zend/Service/Rackspace/Files/Exception/RuntimeException.php
+++ b/library/Zend/Service/Rackspace/Files/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\Files
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files\Exception;
@@ -24,8 +22,6 @@
 /**
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException  extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Files/Object.php b/library/Zend/Service/Rackspace/Files/Object.php
index beeee87889d..fd3a88cea7c 100644
--- a/library/Zend/Service/Rackspace/Files/Object.php
+++ b/library/Zend/Service/Rackspace/Files/Object.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files;
diff --git a/library/Zend/Service/Rackspace/Files/ObjectList.php b/library/Zend/Service/Rackspace/Files/ObjectList.php
index 036de24a3de..2ba9894fbca 100644
--- a/library/Zend/Service/Rackspace/Files/ObjectList.php
+++ b/library/Zend/Service/Rackspace/Files/ObjectList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Files;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Files
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ObjectList implements \Countable, \Iterator, \ArrayAccess
 {
diff --git a/library/Zend/Service/Rackspace/Servers.php b/library/Zend/Service/Rackspace/Servers.php
index bb7a16c422c..638e528671d 100644
--- a/library/Zend/Service/Rackspace/Servers.php
+++ b/library/Zend/Service/Rackspace/Servers.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace;
diff --git a/library/Zend/Service/Rackspace/Servers/Exception/ExceptionInterface.php b/library/Zend/Service/Rackspace/Servers/Exception/ExceptionInterface.php
index fc96416936a..bbb4275e8dc 100644
--- a/library/Zend/Service/Rackspace/Servers/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Rackspace/Servers/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers\Exception;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend\Service\Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends RackspaceException
 {
diff --git a/library/Zend/Service/Rackspace/Servers/Exception/InvalidArgumentException.php b/library/Zend/Service/Rackspace/Servers/Exception/InvalidArgumentException.php
index 09792f4a405..0cb0f2a1a29 100644
--- a/library/Zend/Service/Rackspace/Servers/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Rackspace/Servers/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Servers/Exception/OutOfBoundsException.php b/library/Zend/Service/Rackspace/Servers/Exception/OutOfBoundsException.php
index c8591c3d07b..59d964decb3 100644
--- a/library/Zend/Service/Rackspace/Servers/Exception/OutOfBoundsException.php
+++ b/library/Zend/Service/Rackspace/Servers/Exception/OutOfBoundsException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Servers/Exception/RuntimeException.php b/library/Zend/Service/Rackspace/Servers/Exception/RuntimeException.php
index 9b0896b83fc..eb5cfcd9c52 100644
--- a/library/Zend/Service/Rackspace/Servers/Exception/RuntimeException.php
+++ b/library/Zend/Service/Rackspace/Servers/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers\Exception;
@@ -24,8 +22,6 @@
 /**
  * @package    Zend\Service
  * @subpackage Rackspace
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Rackspace/Servers/Image.php b/library/Zend/Service/Rackspace/Servers/Image.php
index 7c94019f4ee..33f3c618ab2 100644
--- a/library/Zend/Service/Rackspace/Servers/Image.php
+++ b/library/Zend/Service/Rackspace/Servers/Image.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers;
diff --git a/library/Zend/Service/Rackspace/Servers/ImageList.php b/library/Zend/Service/Rackspace/Servers/ImageList.php
index c49cd50364e..8797a17e773 100644
--- a/library/Zend/Service/Rackspace/Servers/ImageList.php
+++ b/library/Zend/Service/Rackspace/Servers/ImageList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ImageList implements \Countable, \Iterator, \ArrayAccess
 {
diff --git a/library/Zend/Service/Rackspace/Servers/Server.php b/library/Zend/Service/Rackspace/Servers/Server.php
index ff23a76de6c..f177ef3c473 100644
--- a/library/Zend/Service/Rackspace/Servers/Server.php
+++ b/library/Zend/Service/Rackspace/Servers/Server.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers;
diff --git a/library/Zend/Service/Rackspace/Servers/ServerList.php b/library/Zend/Service/Rackspace/Servers/ServerList.php
index 85fed51d898..7cc142956a4 100644
--- a/library/Zend/Service/Rackspace/Servers/ServerList.php
+++ b/library/Zend/Service/Rackspace/Servers/ServerList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServerList implements \Countable, \Iterator, \ArrayAccess
 {
diff --git a/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php b/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php
index 5b1d24576ee..98c96a855b0 100644
--- a/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php
+++ b/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php
@@ -16,8 +16,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers;
diff --git a/library/Zend/Service/Rackspace/Servers/SharedIpGroupList.php b/library/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
index 67d8613fe46..40ce29f7e9e 100644
--- a/library/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
+++ b/library/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace\
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Rackspace\Servers;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend\Service\Rackspace
  * @subpackage Servers
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SharedIpGroupList implements \Countable, \Iterator, \ArrayAccess
 {
diff --git a/library/Zend/Service/ReCaptcha/Exception.php b/library/Zend/Service/ReCaptcha/Exception.php
index 2874f6bf191..28eaa540423 100644
--- a/library/Zend/Service/ReCaptcha/Exception.php
+++ b/library/Zend/Service/ReCaptcha/Exception.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\ReCaptcha;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Exception extends \Exception
 {}
diff --git a/library/Zend/Service/ReCaptcha/MailHide.php b/library/Zend/Service/ReCaptcha/MailHide.php
index 6aed2a106a1..b0fa064e53d 100644
--- a/library/Zend/Service/ReCaptcha/MailHide.php
+++ b/library/Zend/Service/ReCaptcha/MailHide.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\ReCaptcha;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MailHide extends ReCaptcha
 {
diff --git a/library/Zend/Service/ReCaptcha/MailHideException.php b/library/Zend/Service/ReCaptcha/MailHideException.php
index cae18e5d2af..0124327158c 100644
--- a/library/Zend/Service/ReCaptcha/MailHideException.php
+++ b/library/Zend/Service/ReCaptcha/MailHideException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\ReCaptcha;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MailhideException extends Exception
 {}
diff --git a/library/Zend/Service/ReCaptcha/ReCaptcha.php b/library/Zend/Service/ReCaptcha/ReCaptcha.php
index cca4ec719bd..223e8127c84 100644
--- a/library/Zend/Service/ReCaptcha/ReCaptcha.php
+++ b/library/Zend/Service/ReCaptcha/ReCaptcha.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\ReCaptcha;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ReCaptcha extends AbstractService
 {
diff --git a/library/Zend/Service/ReCaptcha/Response.php b/library/Zend/Service/ReCaptcha/Response.php
index e00d2307b8d..128b8520412 100644
--- a/library/Zend/Service/ReCaptcha/Response.php
+++ b/library/Zend/Service/ReCaptcha/Response.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\ReCaptcha;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Response
 {
diff --git a/library/Zend/Service/SlideShare/Exception/ExceptionInterface.php b/library/Zend/Service/SlideShare/Exception/ExceptionInterface.php
index 966efec8f41..66a64dd4dd4 100644
--- a/library/Zend/Service/SlideShare/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/SlideShare/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\SlideShare\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/SlideShare/Exception/InvalidArgumentException.php b/library/Zend/Service/SlideShare/Exception/InvalidArgumentException.php
index 6b1258af2b2..d3f2d9a6016 100644
--- a/library/Zend/Service/SlideShare/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/SlideShare/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/SlideShare/Exception/RuntimeException.php b/library/Zend/Service/SlideShare/Exception/RuntimeException.php
index 949d1a2dc31..8eb7c564e1a 100644
--- a/library/Zend/Service/SlideShare/Exception/RuntimeException.php
+++ b/library/Zend/Service/SlideShare/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/SlideShare/SlideShare.php b/library/Zend/Service/SlideShare/SlideShare.php
index c7989536083..476d883c0b2 100644
--- a/library/Zend/Service/SlideShare/SlideShare.php
+++ b/library/Zend/Service/SlideShare/SlideShare.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\SlideShare;
@@ -36,8 +34,6 @@
  * @package    Zend_Service
  * @subpackage SlideShare
  * @throws     Zend\Service\SlideShare\Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SlideShare
 {
diff --git a/library/Zend/Service/SlideShare/SlideShow.php b/library/Zend/Service/SlideShare/SlideShow.php
index 2f0cff6e9a9..c87e4a3f7b2 100644
--- a/library/Zend/Service/SlideShare/SlideShow.php
+++ b/library/Zend/Service/SlideShare/SlideShow.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\SlideShare;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SlideShow
 {
diff --git a/library/Zend/Service/StrikeIron/Base.php b/library/Zend/Service/StrikeIron/Base.php
index 2001dc9d45f..9881d1a85af 100644
--- a/library/Zend/Service/StrikeIron/Base.php
+++ b/library/Zend/Service/StrikeIron/Base.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Base
 {
diff --git a/library/Zend/Service/StrikeIron/Decorator.php b/library/Zend/Service/StrikeIron/Decorator.php
index 335b5f7c9bc..f3412116440 100644
--- a/library/Zend/Service/StrikeIron/Decorator.php
+++ b/library/Zend/Service/StrikeIron/Decorator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Decorator
 {
diff --git a/library/Zend/Service/StrikeIron/Exception/ExceptionInterface.php b/library/Zend/Service/StrikeIron/Exception/ExceptionInterface.php
index 5bfc684fb06..34f66e5a531 100644
--- a/library/Zend/Service/StrikeIron/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/StrikeIron/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Service/StrikeIron/Exception/RuntimeException.php b/library/Zend/Service/StrikeIron/Exception/RuntimeException.php
index 5eaea038a87..1dde5490558 100644
--- a/library/Zend/Service/StrikeIron/Exception/RuntimeException.php
+++ b/library/Zend/Service/StrikeIron/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php b/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php
index e514e3ac767..373c302bac3 100644
--- a/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php
+++ b/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SalesUseTaxBasic extends Base
 {
diff --git a/library/Zend/Service/StrikeIron/StrikeIron.php b/library/Zend/Service/StrikeIron/StrikeIron.php
index 9ea9dd2475d..36d6b607001 100644
--- a/library/Zend/Service/StrikeIron/StrikeIron.php
+++ b/library/Zend/Service/StrikeIron/StrikeIron.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StrikeIron
 {
diff --git a/library/Zend/Service/StrikeIron/USAddressVerification.php b/library/Zend/Service/StrikeIron/USAddressVerification.php
index 6a7f2d73739..639e40a76bb 100644
--- a/library/Zend/Service/StrikeIron/USAddressVerification.php
+++ b/library/Zend/Service/StrikeIron/USAddressVerification.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class USAddressVerification extends Base
 {
diff --git a/library/Zend/Service/StrikeIron/ZipCodeInfo.php b/library/Zend/Service/StrikeIron/ZipCodeInfo.php
index 37809b1ec54..041dea5abb0 100644
--- a/library/Zend/Service/StrikeIron/ZipCodeInfo.php
+++ b/library/Zend/Service/StrikeIron/ZipCodeInfo.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\StrikeIron;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZipCodeInfo extends Base
 {
diff --git a/library/Zend/Service/Technorati/AbstractResult.php b/library/Zend/Service/Technorati/AbstractResult.php
index 5cd6b9aa6df..cb85f319d42 100644
--- a/library/Zend/Service/Technorati/AbstractResult.php
+++ b/library/Zend/Service/Technorati/AbstractResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @abstract
  */
 abstract class AbstractResult
diff --git a/library/Zend/Service/Technorati/AbstractResultSet.php b/library/Zend/Service/Technorati/AbstractResultSet.php
index 1fa3123e2df..4381ff1d6d2 100644
--- a/library/Zend/Service/Technorati/AbstractResultSet.php
+++ b/library/Zend/Service/Technorati/AbstractResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -37,8 +35,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @abstract
  */
 abstract class AbstractResultSet implements SeekableIterator
diff --git a/library/Zend/Service/Technorati/Author.php b/library/Zend/Service/Technorati/Author.php
index 9f2a37c0c50..09bcb687000 100644
--- a/library/Zend/Service/Technorati/Author.php
+++ b/library/Zend/Service/Technorati/Author.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Author
 {
diff --git a/library/Zend/Service/Technorati/BlogInfoResult.php b/library/Zend/Service/Technorati/BlogInfoResult.php
index 8f550cea32a..25d26d1bcfb 100644
--- a/library/Zend/Service/Technorati/BlogInfoResult.php
+++ b/library/Zend/Service/Technorati/BlogInfoResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BlogInfoResult
 {
diff --git a/library/Zend/Service/Technorati/CosmosResult.php b/library/Zend/Service/Technorati/CosmosResult.php
index b6ee6209391..4c63038c45d 100644
--- a/library/Zend/Service/Technorati/CosmosResult.php
+++ b/library/Zend/Service/Technorati/CosmosResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CosmosResult extends AbstractResult
 {
diff --git a/library/Zend/Service/Technorati/CosmosResultSet.php b/library/Zend/Service/Technorati/CosmosResultSet.php
index 9908dbc41f4..8f665621e2c 100644
--- a/library/Zend/Service/Technorati/CosmosResultSet.php
+++ b/library/Zend/Service/Technorati/CosmosResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CosmosResultSet extends AbstractResultSet
 {
diff --git a/library/Zend/Service/Technorati/DailyCountsResult.php b/library/Zend/Service/Technorati/DailyCountsResult.php
index e8000a41e05..c401bd59751 100644
--- a/library/Zend/Service/Technorati/DailyCountsResult.php
+++ b/library/Zend/Service/Technorati/DailyCountsResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DailyCountsResult extends AbstractResult
 {
diff --git a/library/Zend/Service/Technorati/DailyCountsResultSet.php b/library/Zend/Service/Technorati/DailyCountsResultSet.php
index 57de62c6f6d..8ae480457d9 100644
--- a/library/Zend/Service/Technorati/DailyCountsResultSet.php
+++ b/library/Zend/Service/Technorati/DailyCountsResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DailyCountsResultSet extends AbstractResultSet
 {
diff --git a/library/Zend/Service/Technorati/Exception/ExceptionInterface.php b/library/Zend/Service/Technorati/Exception/ExceptionInterface.php
index 8045be899bc..e681dbeebe7 100644
--- a/library/Zend/Service/Technorati/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Technorati/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/Technorati/Exception/RuntimeException.php b/library/Zend/Service/Technorati/Exception/RuntimeException.php
index 87907463dd8..4fb4f9336ae 100644
--- a/library/Zend/Service/Technorati/Exception/RuntimeException.php
+++ b/library/Zend/Service/Technorati/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Technorati/GetInfoResult.php b/library/Zend/Service/Technorati/GetInfoResult.php
index 8b22d840b17..0b011a95fae 100644
--- a/library/Zend/Service/Technorati/GetInfoResult.php
+++ b/library/Zend/Service/Technorati/GetInfoResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GetInfoResult
 {
diff --git a/library/Zend/Service/Technorati/KeyInfoResult.php b/library/Zend/Service/Technorati/KeyInfoResult.php
index 898b6865281..5a546fb0418 100644
--- a/library/Zend/Service/Technorati/KeyInfoResult.php
+++ b/library/Zend/Service/Technorati/KeyInfoResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class KeyInfoResult
 {
diff --git a/library/Zend/Service/Technorati/SearchResult.php b/library/Zend/Service/Technorati/SearchResult.php
index 94a0f9f5076..13650f3e3aa 100644
--- a/library/Zend/Service/Technorati/SearchResult.php
+++ b/library/Zend/Service/Technorati/SearchResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SearchResult extends AbstractResult
 {
diff --git a/library/Zend/Service/Technorati/SearchResultSet.php b/library/Zend/Service/Technorati/SearchResultSet.php
index 34a31851b8b..98a3d887cd1 100644
--- a/library/Zend/Service/Technorati/SearchResultSet.php
+++ b/library/Zend/Service/Technorati/SearchResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SearchResultSet extends AbstractResultSet
 {
diff --git a/library/Zend/Service/Technorati/TagResult.php b/library/Zend/Service/Technorati/TagResult.php
index 681b85ef173..1f7766e597c 100644
--- a/library/Zend/Service/Technorati/TagResult.php
+++ b/library/Zend/Service/Technorati/TagResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TagResult extends AbstractResult
 {
diff --git a/library/Zend/Service/Technorati/TagResultSet.php b/library/Zend/Service/Technorati/TagResultSet.php
index e68ee5bf020..ff8df396a59 100644
--- a/library/Zend/Service/Technorati/TagResultSet.php
+++ b/library/Zend/Service/Technorati/TagResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TagResultSet extends AbstractResultSet
 {
diff --git a/library/Zend/Service/Technorati/TagsResult.php b/library/Zend/Service/Technorati/TagsResult.php
index d97d383c81e..3fa38b79c5f 100644
--- a/library/Zend/Service/Technorati/TagsResult.php
+++ b/library/Zend/Service/Technorati/TagsResult.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TagsResult extends AbstractResult
 {
diff --git a/library/Zend/Service/Technorati/TagsResultSet.php b/library/Zend/Service/Technorati/TagsResultSet.php
index 7c9b4681ed2..a2c8c8d9afd 100644
--- a/library/Zend/Service/Technorati/TagsResultSet.php
+++ b/library/Zend/Service/Technorati/TagsResultSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TagsResultSet extends AbstractResultSet
 {
diff --git a/library/Zend/Service/Technorati/Technorati.php b/library/Zend/Service/Technorati/Technorati.php
index e233b5a799c..f9946d80dea 100644
--- a/library/Zend/Service/Technorati/Technorati.php
+++ b/library/Zend/Service/Technorati/Technorati.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Technorati
 {
diff --git a/library/Zend/Service/Technorati/Utils.php b/library/Zend/Service/Technorati/Utils.php
index 48933dbe423..8b8bc801962 100644
--- a/library/Zend/Service/Technorati/Utils.php
+++ b/library/Zend/Service/Technorati/Utils.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Utils
 {
diff --git a/library/Zend/Service/Technorati/Weblog.php b/library/Zend/Service/Technorati/Weblog.php
index 2b29599d74e..b69d74ac2b5 100644
--- a/library/Zend/Service/Technorati/Weblog.php
+++ b/library/Zend/Service/Technorati/Weblog.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Technorati;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Weblog
 {
diff --git a/library/Zend/Service/Twitter/Exception/BadMethodCallException.php b/library/Zend/Service/Twitter/Exception/BadMethodCallException.php
index 15a3b3c2d8a..9573743ae38 100644
--- a/library/Zend/Service/Twitter/Exception/BadMethodCallException.php
+++ b/library/Zend/Service/Twitter/Exception/BadMethodCallException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Twitter/Exception/DomainException.php b/library/Zend/Service/Twitter/Exception/DomainException.php
index 3194bc372db..3fec9e7c8c3 100644
--- a/library/Zend/Service/Twitter/Exception/DomainException.php
+++ b/library/Zend/Service/Twitter/Exception/DomainException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Twitter/Exception/ExceptionInterface.php b/library/Zend/Service/Twitter/Exception/ExceptionInterface.php
index 5e1ad9eee8d..3bd606b2110 100644
--- a/library/Zend/Service/Twitter/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/Twitter/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Service/Twitter/Exception/InvalidArgumentException.php b/library/Zend/Service/Twitter/Exception/InvalidArgumentException.php
index 9142e8c7e4a..02f60eef61b 100644
--- a/library/Zend/Service/Twitter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/Twitter/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Twitter/Exception/OutOfRangeException.php b/library/Zend/Service/Twitter/Exception/OutOfRangeException.php
index 61d3be15a66..4cd0afaf302 100644
--- a/library/Zend/Service/Twitter/Exception/OutOfRangeException.php
+++ b/library/Zend/Service/Twitter/Exception/OutOfRangeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Twitter/Exception/UnexpectedValueException.php b/library/Zend/Service/Twitter/Exception/UnexpectedValueException.php
index 85a021ba6de..3228e185bdd 100644
--- a/library/Zend/Service/Twitter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Service/Twitter/Exception/UnexpectedValueException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
 {
diff --git a/library/Zend/Service/Twitter/Search.php b/library/Zend/Service/Twitter/Search.php
index 3be529ab1cf..1fa943b708d 100644
--- a/library/Zend/Service/Twitter/Search.php
+++ b/library/Zend/Service/Twitter/Search.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Search extends Client\RestClient
 {
diff --git a/library/Zend/Service/Twitter/SearchOptions.php b/library/Zend/Service/Twitter/SearchOptions.php
index c24ef57748e..5f57663e6c4 100644
--- a/library/Zend/Service/Twitter/SearchOptions.php
+++ b/library/Zend/Service/Twitter/SearchOptions.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SearchOptions extends AbstractOptions
 {
diff --git a/library/Zend/Service/Twitter/Twitter.php b/library/Zend/Service/Twitter/Twitter.php
index d1f88654ecd..ed7cfe3b986 100644
--- a/library/Zend/Service/Twitter/Twitter.php
+++ b/library/Zend/Service/Twitter/Twitter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\Twitter;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Twitter extends Client\RestClient
 {
diff --git a/library/Zend/Service/WindowsAzure/Credentials/AbstractCredentials.php b/library/Zend/Service/WindowsAzure/Credentials/AbstractCredentials.php
index 9c8f79284f4..7455d9f8ac7 100644
--- a/library/Zend/Service/WindowsAzure/Credentials/AbstractCredentials.php
+++ b/library/Zend/Service/WindowsAzure/Credentials/AbstractCredentials.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php b/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
index 562eb50442b..86bfc69936a 100644
--- a/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
+++ b/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php b/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php
index e508498076d..1b9fb2f1b91 100644
--- a/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php
+++ b/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php b/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
index 58da57603c1..da3a91aa28d 100644
--- a/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
+++ b/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Exception/DomainException.php b/library/Zend/Service/WindowsAzure/Exception/DomainException.php
index 6af4a973542..cd7558c75fa 100644
--- a/library/Zend/Service/WindowsAzure/Exception/DomainException.php
+++ b/library/Zend/Service/WindowsAzure/Exception/DomainException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Exception/ExceptionInterface.php b/library/Zend/Service/WindowsAzure/Exception/ExceptionInterface.php
index 4332128f919..e121c4689dc 100644
--- a/library/Zend/Service/WindowsAzure/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/WindowsAzure/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Exception/InvalidArgumentException.php b/library/Zend/Service/WindowsAzure/Exception/InvalidArgumentException.php
index 49c98701927..380167236da 100644
--- a/library/Zend/Service/WindowsAzure/Exception/InvalidArgumentException.php
+++ b/library/Zend/Service/WindowsAzure/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Exception/RuntimeException.php b/library/Zend/Service/WindowsAzure/Exception/RuntimeException.php
index 1bf0d9eed40..9751ee0369c 100644
--- a/library/Zend/Service/WindowsAzure/Exception/RuntimeException.php
+++ b/library/Zend/Service/WindowsAzure/Exception/RuntimeException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Exception/UnknownPropertyException.php b/library/Zend/Service/WindowsAzure/Exception/UnknownPropertyException.php
index 717c0af298a..53bde3740b1 100644
--- a/library/Zend/Service/WindowsAzure/Exception/UnknownPropertyException.php
+++ b/library/Zend/Service/WindowsAzure/Exception/UnknownPropertyException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/AbstractRetryPolicy.php b/library/Zend/Service/WindowsAzure/RetryPolicy/AbstractRetryPolicy.php
index f43ed2133a8..40fe7c49f4b 100644
--- a/library/Zend/Service/WindowsAzure/RetryPolicy/AbstractRetryPolicy.php
+++ b/library/Zend/Service/WindowsAzure/RetryPolicy/AbstractRetryPolicy.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExceptionInterface.php b/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExceptionInterface.php
index ba1f1e116f2..cd93dbc5f1a 100644
--- a/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExceptionInterface.php
+++ b/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExcessiveRetrievesException.php b/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExcessiveRetrievesException.php
index 8338f3ff01f..0e2adaaf247 100644
--- a/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExcessiveRetrievesException.php
+++ b/library/Zend/Service/WindowsAzure/RetryPolicy/Exception/ExcessiveRetrievesException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php b/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
index e05761193e4..a5f69b8f2ac 100644
--- a/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
+++ b/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php b/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
index 4799669b0d1..33b425be0de 100644
--- a/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
+++ b/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/SessionHandler.php b/library/Zend/Service/WindowsAzure/SessionHandler.php
index 127ef8f67a5..762c391332b 100644
--- a/library/Zend/Service/WindowsAzure/SessionHandler.php
+++ b/library/Zend/Service/WindowsAzure/SessionHandler.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/AbstractBatchStorage.php b/library/Zend/Service/WindowsAzure/Storage/AbstractBatchStorage.php
index c8dff55a4bd..4e16bacd12c 100644
--- a/library/Zend/Service/WindowsAzure/Storage/AbstractBatchStorage.php
+++ b/library/Zend/Service/WindowsAzure/Storage/AbstractBatchStorage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\WindowsAzure\Storage;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractBatchStorage extends Storage
 {
diff --git a/library/Zend/Service/WindowsAzure/Storage/Batch.php b/library/Zend/Service/WindowsAzure/Storage/Batch.php
index 6d085b45806..b509918a90a 100644
--- a/library/Zend/Service/WindowsAzure/Storage/Batch.php
+++ b/library/Zend/Service/WindowsAzure/Storage/Batch.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\WindowsAzure\Storage;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Batch
 {
diff --git a/library/Zend/Service/WindowsAzure/Storage/Blob/Blob.php b/library/Zend/Service/WindowsAzure/Storage/Blob/Blob.php
index d723f258d4b..233e83f7a49 100644
--- a/library/Zend/Service/WindowsAzure/Storage/Blob/Blob.php
+++ b/library/Zend/Service/WindowsAzure/Storage/Blob/Blob.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php b/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
index 4e74cf93252..68b411bc30a 100644
--- a/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
+++ b/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php b/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php
index 9800ad48291..1a8767827d7 100644
--- a/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php
+++ b/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\WindowsAzure\Storage;
@@ -27,8 +25,6 @@
  * @category                       Zend
  * @package                        Zend_Service_WindowsAzure
  * @subpackage                     Storage
- * @copyright                      Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license                        http://framework.zend.com/license/new-bsd     New BSD License
  *
  * @property string $Name          Name of the container
  * @property string $Etag          Etag of the container
diff --git a/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php b/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php
index cdac6387afb..ffc72a8e0a3 100644
--- a/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php
+++ b/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Service\WindowsAzure\Storage;
@@ -27,8 +25,6 @@
  * @category                          Zend
  * @package                           Zend_Service_WindowsAzure
  * @subpackage                        Storage
- * @copyright                         Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license                           http://framework.zend.com/license/new-bsd     New BSD License
  *
  * @property string  $Container       Container name
  * @property string  $Name            Name
diff --git a/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php b/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
index 68d4e7587c5..cb8e95e0d0a 100644
--- a/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
+++ b/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/Queue.php b/library/Zend/Service/WindowsAzure/Storage/Queue.php
index 80c34e9d238..e05a90dc626 100644
--- a/library/Zend/Service/WindowsAzure/Storage/Queue.php
+++ b/library/Zend/Service/WindowsAzure/Storage/Queue.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php b/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php
index 3b7178448ad..63bffd59ccf 100644
--- a/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php
+++ b/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php b/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php
index ed165d82860..759b7e56320 100644
--- a/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php
+++ b/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php b/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
index f42458b674f..e32c22aab8c 100644
--- a/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
+++ b/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/Storage.php b/library/Zend/Service/WindowsAzure/Storage/Storage.php
index f7f0cc15025..3fe47997c60 100644
--- a/library/Zend/Service/WindowsAzure/Storage/Storage.php
+++ b/library/Zend/Service/WindowsAzure/Storage/Storage.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/Table.php b/library/Zend/Service/WindowsAzure/Storage/Table.php
index d8e0bd7f79d..62a674343ec 100644
--- a/library/Zend/Service/WindowsAzure/Storage/Table.php
+++ b/library/Zend/Service/WindowsAzure/Storage/Table.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/TableEntity.php b/library/Zend/Service/WindowsAzure/Storage/TableEntity.php
index 849f8f96228..07652a5477c 100644
--- a/library/Zend/Service/WindowsAzure/Storage/TableEntity.php
+++ b/library/Zend/Service/WindowsAzure/Storage/TableEntity.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php b/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
index 71f7b202f20..2116dcc381c 100644
--- a/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
+++ b/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/Service/WindowsAzure/Storage/TableInstance.php b/library/Zend/Service/WindowsAzure/Storage/TableInstance.php
index 50fdcc598e1..13f9acb5a6c 100644
--- a/library/Zend/Service/WindowsAzure/Storage/TableInstance.php
+++ b/library/Zend/Service/WindowsAzure/Storage/TableInstance.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Service_WindowsAzure
  */
 
diff --git a/library/Zend/ServiceManager/AbstractPluginManager.php b/library/Zend/ServiceManager/AbstractPluginManager.php
index e17dde8a437..f5edf74fe0d 100644
--- a/library/Zend/ServiceManager/AbstractPluginManager.php
+++ b/library/Zend/ServiceManager/AbstractPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_ServiceManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ServiceManager;
@@ -34,8 +32,6 @@
  *
  * @category   Zend
  * @package    Zend_ServiceManager
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractPluginManager extends ServiceManager implements ServiceLocatorAwareInterface
 {
diff --git a/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php b/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
index 82d2e2e31fb..aa3df00c73a 100644
--- a/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
+++ b/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ServiceManager\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CircularDependencyFoundException extends RuntimeException
 {}
diff --git a/library/Zend/ServiceManager/Exception/InvalidArgumentException.php b/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
index 6256da0f015..f4ce9d5e8f5 100644
--- a/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
+++ b/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ServiceManager\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements 
     ExceptionInterface
diff --git a/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php b/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
index 6faa988126f..ed4483c61e7 100644
--- a/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
+++ b/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
@@ -3,4 +3,4 @@
 namespace Zend\ServiceManager\Exception;
 
 class InvalidServiceNameException extends RuntimeException
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/ServiceManager/Exception/RuntimeException.php b/library/Zend/ServiceManager/Exception/RuntimeException.php
index bbd4947bc01..c623e56a8af 100644
--- a/library/Zend/ServiceManager/Exception/RuntimeException.php
+++ b/library/Zend/ServiceManager/Exception/RuntimeException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ServiceManager\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php b/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
index 7e1f9c0e476..1c23a730d76 100644
--- a/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
+++ b/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ServiceManager\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServiceNotCreatedException extends RuntimeException
 {}
diff --git a/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php b/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
index e047b02e1f8..5fd7d8f02e5 100644
--- a/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
+++ b/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage UnitTest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\ServiceManager\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_ServiceManager
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServiceNotFoundException extends InvalidArgumentException
 {}
diff --git a/library/Zend/Session/AbstractManager.php b/library/Zend/Session/AbstractManager.php
index ae8460068bc..0b95fe21c2a 100644
--- a/library/Zend/Session/AbstractManager.php
+++ b/library/Zend/Session/AbstractManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractManager implements Manager
 {
diff --git a/library/Zend/Session/Configuration/ConfigurationInterface.php b/library/Zend/Session/Configuration/ConfigurationInterface.php
index 3161a9104e6..fe14494f768 100644
--- a/library/Zend/Session/Configuration/ConfigurationInterface.php
+++ b/library/Zend/Session/Configuration/ConfigurationInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Configuration;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ConfigurationInterface
 {
diff --git a/library/Zend/Session/Configuration/SessionConfiguration.php b/library/Zend/Session/Configuration/SessionConfiguration.php
index d93ac704899..63ea43965d6 100644
--- a/library/Zend/Session/Configuration/SessionConfiguration.php
+++ b/library/Zend/Session/Configuration/SessionConfiguration.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Configuration;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage Configuration
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SessionConfiguration extends StandardConfiguration
 {
diff --git a/library/Zend/Session/Configuration/StandardConfiguration.php b/library/Zend/Session/Configuration/StandardConfiguration.php
index 208bc11c986..52e24bd6b9a 100644
--- a/library/Zend/Session/Configuration/StandardConfiguration.php
+++ b/library/Zend/Session/Configuration/StandardConfiguration.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Configuration;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage Configuration
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StandardConfiguration implements Configurable
 {
diff --git a/library/Zend/Session/Container.php b/library/Zend/Session/Container.php
index ed20967e46a..01177f6056f 100644
--- a/library/Zend/Session/Container.php
+++ b/library/Zend/Session/Container.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session;
@@ -35,8 +33,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Container extends ArrayObject
 {
diff --git a/library/Zend/Session/Exception/ExceptionInterface.php b/library/Zend/Session/Exception/ExceptionInterface.php
index 6a66b633b4a..e2be078d54f 100644
--- a/library/Zend/Session/Exception/ExceptionInterface.php
+++ b/library/Zend/Session/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @since      Preview Release 0.2
  */
 
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Session/ManagerInterface.php b/library/Zend/Session/ManagerInterface.php
index 0cb1a960b47..ccadf110138 100644
--- a/library/Zend/Session/ManagerInterface.php
+++ b/library/Zend/Session/ManagerInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ManagerInterface
 {
diff --git a/library/Zend/Session/SaveHandler/Cache.php b/library/Zend/Session/SaveHandler/Cache.php
index cab7a6b47ae..d4c9d456cce 100644
--- a/library/Zend/Session/SaveHandler/Cache.php
+++ b/library/Zend/Session/SaveHandler/Cache.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\SaveHandler;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage SaveHandler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cache implements SaveHandlerInterface
 {
diff --git a/library/Zend/Session/SaveHandler/DbTableGateway.php b/library/Zend/Session/SaveHandler/DbTableGateway.php
index cd33f80af42..c3adf663fdd 100644
--- a/library/Zend/Session/SaveHandler/DbTableGateway.php
+++ b/library/Zend/Session/SaveHandler/DbTableGateway.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\SaveHandler;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage SaveHandler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbTableGateway implements SaveHandlerInterface
 {
diff --git a/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php b/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
index d6efc7c29f2..3204851bcd4 100644
--- a/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
+++ b/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\SaveHandler;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage SaveHandler
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbTableGatewayOptions extends AbstractOptions
 {
diff --git a/library/Zend/Session/SaveHandler/SaveHandlerInterface.php b/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
index e0fbf916b7e..42e0ab161d4 100644
--- a/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
+++ b/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @since      Preview Release 0.2
  */
 
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://php.net/session_set_save_handler
  */
 interface SaveHandlerInterface
diff --git a/library/Zend/Session/SessionManager.php b/library/Zend/Session/SessionManager.php
index 55fa62f3ef2..3cef6667a9a 100644
--- a/library/Zend/Session/SessionManager.php
+++ b/library/Zend/Session/SessionManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SessionManager extends AbstractManager
 {
diff --git a/library/Zend/Session/Storage/ArrayStorage.php b/library/Zend/Session/Storage/ArrayStorage.php
index 45953da1f32..d94f507f20b 100644
--- a/library/Zend/Session/Storage/ArrayStorage.php
+++ b/library/Zend/Session/Storage/ArrayStorage.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Storage;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayStorage extends ArrayObject implements StorageInterface
 {
diff --git a/library/Zend/Session/Storage/SessionStorage.php b/library/Zend/Session/Storage/SessionStorage.php
index ae36cdde214..74e4744ccab 100644
--- a/library/Zend/Session/Storage/SessionStorage.php
+++ b/library/Zend/Session/Storage/SessionStorage.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Storage;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SessionStorage extends ArrayStorage
 {
diff --git a/library/Zend/Session/Storage/StorageInterface.php b/library/Zend/Session/Storage/StorageInterface.php
index f9ee597c099..17aa1eceeb8 100644
--- a/library/Zend/Session/Storage/StorageInterface.php
+++ b/library/Zend/Session/Storage/StorageInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Storage;
@@ -33,8 +31,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface StorageInterface extends Traversable, ArrayAccess, Serializable, Countable
 {
diff --git a/library/Zend/Session/Validator/HttpUserAgent.php b/library/Zend/Session/Validator/HttpUserAgent.php
index 1e52881dca8..ce0fbe2d739 100644
--- a/library/Zend/Session/Validator/HttpUserAgent.php
+++ b/library/Zend/Session/Validator/HttpUserAgent.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @since      Preview Release 0.2
  */
 
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpUserAgent implements ValidatorInterface
 {
diff --git a/library/Zend/Session/Validator/RemoteAddr.php b/library/Zend/Session/Validator/RemoteAddr.php
index 6d62a2b4465..2eded1e28f5 100644
--- a/library/Zend/Session/Validator/RemoteAddr.php
+++ b/library/Zend/Session/Validator/RemoteAddr.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Validator;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_Session
  * @subpackage Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RemoteAddr implements SessionValidator
 {
diff --git a/library/Zend/Session/Validator/ValidatorInterface.php b/library/Zend/Session/Validator/ValidatorInterface.php
index 3fe31a529e5..4ff5f9eba13 100644
--- a/library/Zend/Session/Validator/ValidatorInterface.php
+++ b/library/Zend/Session/Validator/ValidatorInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session\Validator;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ValidatorInterface
 {
diff --git a/library/Zend/Session/ValidatorChain.php b/library/Zend/Session/ValidatorChain.php
index c2e00ce8a46..9529ee55d95 100644
--- a/library/Zend/Session/ValidatorChain.php
+++ b/library/Zend/Session/ValidatorChain.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Session;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ValidatorChain extends EventManager
 {
diff --git a/library/Zend/Soap/AutoDiscover.php b/library/Zend/Soap/AutoDiscover.php
index 37f5d3b4203..fb91ea02567 100644
--- a/library/Zend/Soap/AutoDiscover.php
+++ b/library/Zend/Soap/AutoDiscover.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage AutoDiscover
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap;
diff --git a/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
index 96046e289d3..40f78625fff 100644
--- a/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
+++ b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\AutoDiscover\DiscoveryStrategy;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface DiscoveryStrategyInterface
 {
diff --git a/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
index 3862522d2ec..a88c359300f 100644
--- a/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
+++ b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\AutoDiscover\DiscoveryStrategy;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 class ReflectionDiscovery implements DiscoveryStrategyInterface
diff --git a/library/Zend/Soap/Client.php b/library/Zend/Soap/Client.php
index 4335d5d6c96..74449eceb5e 100644
--- a/library/Zend/Soap/Client.php
+++ b/library/Zend/Soap/Client.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Client implements ServerClient
 {
diff --git a/library/Zend/Soap/Client/Common.php b/library/Zend/Soap/Client/Common.php
index c1f062e4744..7b340d8dd74 100644
--- a/library/Zend/Soap/Client/Common.php
+++ b/library/Zend/Soap/Client/Common.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Client;
diff --git a/library/Zend/Soap/Client/DotNet.php b/library/Zend/Soap/Client/DotNet.php
index 58124fde4e6..3c2b9aec3fa 100644
--- a/library/Zend/Soap/Client/DotNet.php
+++ b/library/Zend/Soap/Client/DotNet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Client;
diff --git a/library/Zend/Soap/Client/Local.php b/library/Zend/Soap/Client/Local.php
index 36634e89746..ac1689592d8 100644
--- a/library/Zend/Soap/Client/Local.php
+++ b/library/Zend/Soap/Client/Local.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Client;
diff --git a/library/Zend/Soap/Exception/BadMethodCallException.php b/library/Zend/Soap/Exception/BadMethodCallException.php
index 6d1fce2486e..681ad04e732 100644
--- a/library/Zend/Soap/Exception/BadMethodCallException.php
+++ b/library/Zend/Soap/Exception/BadMethodCallException.php
@@ -5,4 +5,4 @@
 class BadMethodCallException
     extends \BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Soap/Exception/ExceptionInterface.php b/library/Zend/Soap/Exception/ExceptionInterface.php
index 6e31e4d3988..91e11a15d50 100644
--- a/library/Zend/Soap/Exception/ExceptionInterface.php
+++ b/library/Zend/Soap/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage AutoDiscover
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage AutoDiscover
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Soap/Exception/ExceptionNotLoadedException.php b/library/Zend/Soap/Exception/ExceptionNotLoadedException.php
index 7bcc386326c..dc4e50c9dcb 100644
--- a/library/Zend/Soap/Exception/ExceptionNotLoadedException.php
+++ b/library/Zend/Soap/Exception/ExceptionNotLoadedException.php
@@ -3,4 +3,4 @@
 namespace Zend\Soap\Exception;
 
 class ExtensionNotLoadedException extends RuntimeException
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Soap/Exception/InvalidArgumentException.php b/library/Zend/Soap/Exception/InvalidArgumentException.php
index aaf720bdf5e..7330039eaf9 100644
--- a/library/Zend/Soap/Exception/InvalidArgumentException.php
+++ b/library/Zend/Soap/Exception/InvalidArgumentException.php
@@ -5,4 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Soap/Exception/RuntimeException.php b/library/Zend/Soap/Exception/RuntimeException.php
index 272c29cfaa0..4f6e40a5b34 100644
--- a/library/Zend/Soap/Exception/RuntimeException.php
+++ b/library/Zend/Soap/Exception/RuntimeException.php
@@ -5,4 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Soap/Exception/UnexpectedValueException.php b/library/Zend/Soap/Exception/UnexpectedValueException.php
index c18e240249c..d65e0291ba8 100644
--- a/library/Zend/Soap/Exception/UnexpectedValueException.php
+++ b/library/Zend/Soap/Exception/UnexpectedValueException.php
@@ -5,4 +5,4 @@
 class UnexpectedValueException
     extends \UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Soap/Server.php b/library/Zend/Soap/Server.php
index 9032adeb847..6fba077ed97 100644
--- a/library/Zend/Soap/Server.php
+++ b/library/Zend/Soap/Server.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Server implements \Zend\Server\Server
 {
diff --git a/library/Zend/Soap/Server/DocumentLiteralWrapper.php b/library/Zend/Soap/Server/DocumentLiteralWrapper.php
index 5bfa44dc390..975d766ee3c 100644
--- a/library/Zend/Soap/Server/DocumentLiteralWrapper.php
+++ b/library/Zend/Soap/Server/DocumentLiteralWrapper.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Server;
@@ -82,8 +80,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentLiteralWrapper
 {
diff --git a/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php
index 5ef545ad855..bfa6f8abaa7 100644
--- a/library/Zend/Soap/Wsdl.php
+++ b/library/Zend/Soap/Wsdl.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Soap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Soap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Wsdl
 {
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
index 2cec9bff5ad..bcbb8030bf4 100644
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractComplexTypeStrategy implements ComplexTypeStrategyInterface
 {
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
index 528b9a6b99e..ca3130863aa 100644
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AnyType implements ComplexTypeStrategyInterface
 {
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
index f96210c2b72..5ad89276558 100644
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayOfTypeComplex extends DefaultComplexType
 {
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
index 1abe82b8a81..d96708817ec 100644
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Soap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayOfTypeSequence extends DefaultComplexType
 {
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
index f26c2f59c21..5161376d090 100644
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ComplexTypeStrategyInterface
 {
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
index be496b0e203..3929de37256 100644
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Composite implements ComplexTypeStrategy
 {
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
index 767ea483d58..65453c9fa65 100644
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage WSDL
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DefaultComplexType extends AbstractComplexTypeStrategy
 {
diff --git a/library/Zend/Stdlib/AbstractOptions.php b/library/Zend/Stdlib/AbstractOptions.php
index 67f7f01675c..967a0274e79 100644
--- a/library/Zend/Stdlib/AbstractOptions.php
+++ b/library/Zend/Stdlib/AbstractOptions.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractOptions implements ParameterObjectInterface
 {
diff --git a/library/Zend/Stdlib/ArraySerializableInterface.php b/library/Zend/Stdlib/ArraySerializableInterface.php
index d943e57743e..e561ba8a388 100644
--- a/library/Zend/Stdlib/ArraySerializableInterface.php
+++ b/library/Zend/Stdlib/ArraySerializableInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ArraySerializableInterface
 {
diff --git a/library/Zend/Stdlib/ArrayStack.php b/library/Zend/Stdlib/ArrayStack.php
index d21a509bde1..21a5245a644 100644
--- a/library/Zend/Stdlib/ArrayStack.php
+++ b/library/Zend/Stdlib/ArrayStack.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayStack extends ArrayObject
 {
diff --git a/library/Zend/Stdlib/ArrayUtils.php b/library/Zend/Stdlib/ArrayUtils.php
index f3a9be7de0a..fae5269f4bb 100644
--- a/library/Zend/Stdlib/ArrayUtils.php
+++ b/library/Zend/Stdlib/ArrayUtils.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class ArrayUtils
 {
diff --git a/library/Zend/Stdlib/CallbackHandler.php b/library/Zend/Stdlib/CallbackHandler.php
index 8297811228f..daca08d28d4 100644
--- a/library/Zend/Stdlib/CallbackHandler.php
+++ b/library/Zend/Stdlib/CallbackHandler.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -33,8 +31,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CallbackHandler
 {
diff --git a/library/Zend/Stdlib/ErrorHandler.php b/library/Zend/Stdlib/ErrorHandler.php
index ad56b691922..8938b0ce385 100644
--- a/library/Zend/Stdlib/ErrorHandler.php
+++ b/library/Zend/Stdlib/ErrorHandler.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -28,8 +26,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class ErrorHandler
 {
diff --git a/library/Zend/Stdlib/Exception/BadMethodCallException.php b/library/Zend/Stdlib/Exception/BadMethodCallException.php
index 1e10d34d074..b12ba6d2cde 100644
--- a/library/Zend/Stdlib/Exception/BadMethodCallException.php
+++ b/library/Zend/Stdlib/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
diff --git a/library/Zend/Stdlib/Exception/InvalidCallbackException.php b/library/Zend/Stdlib/Exception/InvalidCallbackException.php
index 70ec8b62e11..4c9a53822fc 100644
--- a/library/Zend/Stdlib/Exception/InvalidCallbackException.php
+++ b/library/Zend/Stdlib/Exception/InvalidCallbackException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidCallbackException extends DomainException implements ExceptionInterface
 {
diff --git a/library/Zend/Stdlib/Exception/LogicException.php b/library/Zend/Stdlib/Exception/LogicException.php
index cedd2661758..fd61fe48998 100644
--- a/library/Zend/Stdlib/Exception/LogicException.php
+++ b/library/Zend/Stdlib/Exception/LogicException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LogicException extends \LogicException implements ExceptionInterface
 {
diff --git a/library/Zend/Stdlib/Glob.php b/library/Zend/Stdlib/Glob.php
index 16750e47e6a..afb722074ac 100644
--- a/library/Zend/Stdlib/Glob.php
+++ b/library/Zend/Stdlib/Glob.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Glob
 {
diff --git a/library/Zend/Stdlib/Hydrator/ArraySerializable.php b/library/Zend/Stdlib/Hydrator/ArraySerializable.php
index da5ed9c6192..baab5b073df 100644
--- a/library/Zend/Stdlib/Hydrator/ArraySerializable.php
+++ b/library/Zend/Stdlib/Hydrator/ArraySerializable.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArraySerializable implements HydratorInterface
 {
diff --git a/library/Zend/Stdlib/Hydrator/ClassMethods.php b/library/Zend/Stdlib/Hydrator/ClassMethods.php
index 4218eef3ca0..40431898e32 100644
--- a/library/Zend/Stdlib/Hydrator/ClassMethods.php
+++ b/library/Zend/Stdlib/Hydrator/ClassMethods.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ClassMethods implements HydratorInterface
 {
diff --git a/library/Zend/Stdlib/Hydrator/HydratorInterface.php b/library/Zend/Stdlib/Hydrator/HydratorInterface.php
index a97db30e5ef..87f24ed4228 100644
--- a/library/Zend/Stdlib/Hydrator/HydratorInterface.php
+++ b/library/Zend/Stdlib/Hydrator/HydratorInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface HydratorInterface
 {
diff --git a/library/Zend/Stdlib/Hydrator/ObjectProperty.php b/library/Zend/Stdlib/Hydrator/ObjectProperty.php
index e0619bba5c3..60a6c5f1183 100644
--- a/library/Zend/Stdlib/Hydrator/ObjectProperty.php
+++ b/library/Zend/Stdlib/Hydrator/ObjectProperty.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ObjectProperty implements HydratorInterface
 {
diff --git a/library/Zend/Stdlib/Hydrator/Reflection.php b/library/Zend/Stdlib/Hydrator/Reflection.php
index 7bc9908fc0d..db1447db70f 100644
--- a/library/Zend/Stdlib/Hydrator/Reflection.php
+++ b/library/Zend/Stdlib/Hydrator/Reflection.php
@@ -76,4 +76,4 @@ protected static function getReflProperties($input)
 
         return self::$reflProperties[$input];
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Stdlib/ParameterObjectInterface.php b/library/Zend/Stdlib/ParameterObjectInterface.php
index 095ba21bb52..952f29cbd58 100644
--- a/library/Zend/Stdlib/ParameterObjectInterface.php
+++ b/library/Zend/Stdlib/ParameterObjectInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ParameterObjectInterface
 {
diff --git a/library/Zend/Stdlib/PriorityQueue.php b/library/Zend/Stdlib/PriorityQueue.php
index 2d2fe8ff2bb..23248d0b69a 100644
--- a/library/Zend/Stdlib/PriorityQueue.php
+++ b/library/Zend/Stdlib/PriorityQueue.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -38,8 +36,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PriorityQueue implements Countable, IteratorAggregate, Serializable
 {
diff --git a/library/Zend/Stdlib/SplPriorityQueue.php b/library/Zend/Stdlib/SplPriorityQueue.php
index cceef40c03f..26b391ec24e 100644
--- a/library/Zend/Stdlib/SplPriorityQueue.php
+++ b/library/Zend/Stdlib/SplPriorityQueue.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -30,8 +28,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SplPriorityQueue extends \SplPriorityQueue implements Serializable
 {
diff --git a/library/Zend/Stdlib/SplQueue.php b/library/Zend/Stdlib/SplQueue.php
index ef7d6a4b936..ed91f37aeee 100644
--- a/library/Zend/Stdlib/SplQueue.php
+++ b/library/Zend/Stdlib/SplQueue.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SplQueue extends \SplQueue implements Serializable
 {
diff --git a/library/Zend/Stdlib/SplStack.php b/library/Zend/Stdlib/SplStack.php
index 139908ad286..8078b7911c2 100644
--- a/library/Zend/Stdlib/SplStack.php
+++ b/library/Zend/Stdlib/SplStack.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Stdlib;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SplStack extends \SplStack implements Serializable
 {
diff --git a/library/Zend/Tag/Cloud.php b/library/Zend/Tag/Cloud.php
index 67c7d762619..cffc37c7588 100644
--- a/library/Zend/Tag/Cloud.php
+++ b/library/Zend/Tag/Cloud.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cloud
 {
diff --git a/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php b/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
index 47cd377c5f3..8ccfba27d05 100644
--- a/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
+++ b/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Cloud\Decorator;
@@ -30,8 +28,6 @@
  *
  * @category  Zend
  * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCloud implements Decorator
 {
diff --git a/library/Zend/Tag/Cloud/Decorator/AbstractTag.php b/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
index eacf3b8c1af..2eaadc09b97 100644
--- a/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
+++ b/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Cloud\Decorator;
@@ -30,8 +28,6 @@
  *
  * @category  Zend
  * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractTag implements Decorator
 {
diff --git a/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php b/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
index 0359e7782ea..5f6b484954e 100644
--- a/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
+++ b/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Cloud\Decorator;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface DecoratorInterface
 {
diff --git a/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php b/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
index 6bb04ec9fd4..396757f4e5a 100644
--- a/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
+++ b/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Cloud\Decorator\Exception;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Tag
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php b/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
index 8b0a585ca05..540f44f1c6c 100644
--- a/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
@@ -7,4 +7,4 @@
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
index 662af14bbe4..138bd4ca151 100644
--- a/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
+++ b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Cloud\Decorator;
@@ -26,8 +24,6 @@
  *
  * @category  Zend
  * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlCloud extends AbstractCloud
 {
diff --git a/library/Zend/Tag/Cloud/Decorator/HtmlTag.php b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
index 184fe35f646..200c6626375 100644
--- a/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
+++ b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Cloud\Decorator;
@@ -29,8 +27,6 @@
  *
  * @category  Zend
  * @package   Zend_Tag
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlTag extends AbstractTag
 {
diff --git a/library/Zend/Tag/Cloud/DecoratorPluginManager.php b/library/Zend/Tag/Cloud/DecoratorPluginManager.php
index e72a7d3dbfc..df8019184b0 100644
--- a/library/Zend/Tag/Cloud/DecoratorPluginManager.php
+++ b/library/Zend/Tag/Cloud/DecoratorPluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Cloud;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DecoratorPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Tag/Exception/ExceptionInterface.php b/library/Zend/Tag/Exception/ExceptionInterface.php
index 1dc92e76e7d..6d682699782 100644
--- a/library/Zend/Tag/Exception/ExceptionInterface.php
+++ b/library/Zend/Tag/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag\Exception;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Tag
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/Tag/Exception/InvalidArgumentException.php b/library/Zend/Tag/Exception/InvalidArgumentException.php
index 78a1d5b45f5..a691d1f67bf 100644
--- a/library/Zend/Tag/Exception/InvalidArgumentException.php
+++ b/library/Zend/Tag/Exception/InvalidArgumentException.php
@@ -4,4 +4,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Tag/Exception/OutOfBoundsException.php b/library/Zend/Tag/Exception/OutOfBoundsException.php
index 621f6a51a22..e89cb41f800 100644
--- a/library/Zend/Tag/Exception/OutOfBoundsException.php
+++ b/library/Zend/Tag/Exception/OutOfBoundsException.php
@@ -4,4 +4,4 @@
 class OutOfBoundsException
     extends \OutOfBoundsException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Tag/Item.php b/library/Zend/Tag/Item.php
index a10cae681a0..4e1b7c3d3dd 100644
--- a/library/Zend/Tag/Item.php
+++ b/library/Zend/Tag/Item.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Item
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Item implements TaggableInterface
 {
diff --git a/library/Zend/Tag/ItemList.php b/library/Zend/Tag/ItemList.php
index 41f67bbbb4a..b40171b6604 100644
--- a/library/Zend/Tag/ItemList.php
+++ b/library/Zend/Tag/ItemList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage ItemList
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag;
@@ -32,8 +30,6 @@
 /**
  * @category   Zend
  * @package    Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ItemList implements Countable, SeekableIterator, ArrayAccess
 {
diff --git a/library/Zend/Tag/TaggableInterface.php b/library/Zend/Tag/TaggableInterface.php
index feb2943abe2..0a1746b650d 100644
--- a/library/Zend/Tag/TaggableInterface.php
+++ b/library/Zend/Tag/TaggableInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Tag
  * @subpackage Item
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Tag;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Tag
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TaggableInterface
 {
diff --git a/library/Zend/Test/DbAdapter.php b/library/Zend/Test/DbAdapter.php
index 77c7e5b8d9d..d2d4e3b49c8 100644
--- a/library/Zend/Test/DbAdapter.php
+++ b/library/Zend/Test/DbAdapter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbAdapter extends \Zend\Db\Adapter\AbstractAdapter
 {
diff --git a/library/Zend/Test/DbStatement.php b/library/Zend/Test/DbStatement.php
index f0ac2eb94e8..40c84dd76dc 100644
--- a/library/Zend/Test/DbStatement.php
+++ b/library/Zend/Test/DbStatement.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbStatement implements Statement
 {
diff --git a/library/Zend/Test/PHPUnit/AbstractDatabaseTestCase.php b/library/Zend/Test/PHPUnit/AbstractDatabaseTestCase.php
index 76e06277382..9e53ba9ec54 100644
--- a/library/Zend/Test/PHPUnit/AbstractDatabaseTestCase.php
+++ b/library/Zend/Test/PHPUnit/AbstractDatabaseTestCase.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractDatabaseTestCase extends \PHPUnit_Extensions_Database_TestCase
 {
diff --git a/library/Zend/Test/PHPUnit/Db/Connection.php b/library/Zend/Test/PHPUnit/Db/Connection.php
index 1cff82d52fb..44a4e21af5a 100644
--- a/library/Zend/Test/PHPUnit/Db/Connection.php
+++ b/library/Zend/Test/PHPUnit/Db/Connection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Connection extends \PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection
 {
diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
index d837fb2647b..0297c10305e 100644
--- a/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
+++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\DataSet;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbRowset extends \PHPUnit_Extensions_Database_DataSet_AbstractTable
 {
diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
index ab4f86b88fb..be255871ad7 100644
--- a/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
+++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\DataSet;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbTable extends \PHPUnit_Extensions_Database_DataSet_QueryTable
 {
diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
index 1d47e7bd0b3..55ab01e1a53 100644
--- a/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
+++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\DataSet;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DbTableDataSet extends \PHPUnit_Extensions_Database_DataSet_AbstractDataSet
 {
diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php b/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
index 591d2571a44..12970ea120d 100644
--- a/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
+++ b/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\DataSet;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryDataSet extends \PHPUnit_Extensions_Database_DataSet_QueryDataSet
 {
diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php b/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
index 4dd1fa7363d..e10115e7a29 100644
--- a/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
+++ b/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\DataSet;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueryTable extends \PHPUnit_Extensions_Database_DataSet_QueryTable
 {
diff --git a/library/Zend/Test/PHPUnit/Db/Exception.php b/library/Zend/Test/PHPUnit/Db/Exception.php
index 7e68447b4d4..33b966a1a09 100644
--- a/library/Zend/Test/PHPUnit/Db/Exception.php
+++ b/library/Zend/Test/PHPUnit/Db/Exception.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db;
diff --git a/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php b/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php
index 4e415f21cf4..03b477f6a0c 100644
--- a/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php
+++ b/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\Metadata;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Generic implements \PHPUnit_Extensions_Database_DB_IMetaData
 {
diff --git a/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php b/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
index 8abeb555068..d8a47403514 100644
--- a/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
+++ b/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\Operation;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DeleteAll implements \PHPUnit_Extensions_Database_Operation_IDatabaseOperation
 {
diff --git a/library/Zend/Test/PHPUnit/Db/Operation/Insert.php b/library/Zend/Test/PHPUnit/Db/Operation/Insert.php
index b581923a86b..ec7292c5cf1 100644
--- a/library/Zend/Test/PHPUnit/Db/Operation/Insert.php
+++ b/library/Zend/Test/PHPUnit/Db/Operation/Insert.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\Operation;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Insert implements \PHPUnit_Extensions_Database_Operation_IDatabaseOperation
 {
diff --git a/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php b/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php
index bca8f3c1415..8fb32b4987d 100644
--- a/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php
+++ b/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db\Operation;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Truncate implements \PHPUnit_Extensions_Database_Operation_IDatabaseOperation
 {
diff --git a/library/Zend/Test/PHPUnit/Db/SimpleTester.php b/library/Zend/Test/PHPUnit/Db/SimpleTester.php
index 7538899d84a..60866a766b6 100644
--- a/library/Zend/Test/PHPUnit/Db/SimpleTester.php
+++ b/library/Zend/Test/PHPUnit/Db/SimpleTester.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Test\PHPUnit\Db;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleTester extends \PHPUnit_Extensions_Database_DefaultTester
 {
diff --git a/library/Zend/Text/Exception/ExceptionInterface.php b/library/Zend/Text/Exception/ExceptionInterface.php
index 64a403e6f80..dc2f511ff99 100644
--- a/library/Zend/Text/Exception/ExceptionInterface.php
+++ b/library/Zend/Text/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Text/Exception/InvalidArgumentException.php b/library/Zend/Text/Exception/InvalidArgumentException.php
index b0784325d7c..18a7eadac3e 100644
--- a/library/Zend/Text/Exception/InvalidArgumentException.php
+++ b/library/Zend/Text/Exception/InvalidArgumentException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Text
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Exception;
@@ -24,8 +22,6 @@
 /**
  * @category   Zend
  * @package    Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/Text/Exception/OutOfBoundsException.php b/library/Zend/Text/Exception/OutOfBoundsException.php
index 51f56344426..15effb49cd6 100644
--- a/library/Zend/Text/Exception/OutOfBoundsException.php
+++ b/library/Zend/Text/Exception/OutOfBoundsException.php
@@ -7,4 +7,4 @@
 class OutOfBoundsException 
     extends \OutOfBoundsException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Exception/OverflowException.php b/library/Zend/Text/Exception/OverflowException.php
index 32dd2fa84b7..97c7deb5c16 100644
--- a/library/Zend/Text/Exception/OverflowException.php
+++ b/library/Zend/Text/Exception/OverflowException.php
@@ -7,4 +7,4 @@
 class OverflowException
     extends \OverflowException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Exception/RuntimeException.php b/library/Zend/Text/Exception/RuntimeException.php
index 7174ed95287..98bfea4cfc7 100644
--- a/library/Zend/Text/Exception/RuntimeException.php
+++ b/library/Zend/Text/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Exception;
@@ -23,10 +21,8 @@
 /**
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException 
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Exception/UnexpectedValueException.php b/library/Zend/Text/Exception/UnexpectedValueException.php
index 916fd7e36b4..62f3387b861 100644
--- a/library/Zend/Text/Exception/UnexpectedValueException.php
+++ b/library/Zend/Text/Exception/UnexpectedValueException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException 
     extends \UnexpectedValueException
diff --git a/library/Zend/Text/Figlet/Exception/ExceptionInterface.php b/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
index 1685579495f..3fc2a9227d3 100644
--- a/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
+++ b/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Figlet\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {}
diff --git a/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php b/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
index 983d395758a..a8d77b257da 100644
--- a/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
+++ b/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
 
@@ -28,10 +26,8 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException 
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Figlet/Exception/RuntimeException.php b/library/Zend/Text/Figlet/Exception/RuntimeException.php
index 74527032c61..0bd9909798e 100644
--- a/library/Zend/Text/Figlet/Exception/RuntimeException.php
+++ b/library/Zend/Text/Figlet/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Figlet\Exception;
@@ -27,10 +25,8 @@
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException 
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php b/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
index af1c7a6a2fa..9ca9bb85e7d 100644
--- a/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
+++ b/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Figlet\Exception;
@@ -27,10 +25,8 @@
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException 
     extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Figlet/Figlet.php b/library/Zend/Text/Figlet/Figlet.php
index 4997c0c79b3..5a3e5900b10 100644
--- a/library/Zend/Text/Figlet/Figlet.php
+++ b/library/Zend/Text/Figlet/Figlet.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Figlet;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Figlet
 {
diff --git a/library/Zend/Text/MultiByte.php b/library/Zend/Text/MultiByte.php
index dede30e3a85..e8e2e75442c 100644
--- a/library/Zend/Text/MultiByte.php
+++ b/library/Zend/Text/MultiByte.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MultiByte
 {
diff --git a/library/Zend/Text/Table/Column.php b/library/Zend/Text/Table/Column.php
index 813f632c3be..5cb662b8b75 100644
--- a/library/Zend/Text/Table/Column.php
+++ b/library/Zend/Text/Table/Column.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Table;
@@ -26,8 +24,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Column
 {
diff --git a/library/Zend/Text/Table/Decorator/Ascii.php b/library/Zend/Text/Table/Decorator/Ascii.php
index ace8d45fc9a..40b6df2af31 100644
--- a/library/Zend/Text/Table/Decorator/Ascii.php
+++ b/library/Zend/Text/Table/Decorator/Ascii.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Table\Decorator;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ascii implements Decorator
 {
diff --git a/library/Zend/Text/Table/Decorator/DecoratorInterface.php b/library/Zend/Text/Table/Decorator/DecoratorInterface.php
index c32e2d48e4c..53da2e0d7f0 100644
--- a/library/Zend/Text/Table/Decorator/DecoratorInterface.php
+++ b/library/Zend/Text/Table/Decorator/DecoratorInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Table\Decorator;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface DecoratorInterface
 {
diff --git a/library/Zend/Text/Table/Decorator/Unicode.php b/library/Zend/Text/Table/Decorator/Unicode.php
index dee7344a4f3..fa87a984c9f 100644
--- a/library/Zend/Text/Table/Decorator/Unicode.php
+++ b/library/Zend/Text/Table/Decorator/Unicode.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Table\Decorator;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Unicode implements Decorator
 {
diff --git a/library/Zend/Text/Table/Exception/OutOfBoundsException.php b/library/Zend/Text/Table/Exception/OutOfBoundsException.php
index dc0e452af20..1ea2576e6bc 100644
--- a/library/Zend/Text/Table/Exception/OutOfBoundsException.php
+++ b/library/Zend/Text/Table/Exception/OutOfBoundsException.php
@@ -7,4 +7,4 @@
 class OutOfBoundsException 
     extends Exception\OutOfBoundsException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Table/Exception/OverflowException.php b/library/Zend/Text/Table/Exception/OverflowException.php
index c3be4c7078d..6b80ea9ceb4 100644
--- a/library/Zend/Text/Table/Exception/OverflowException.php
+++ b/library/Zend/Text/Table/Exception/OverflowException.php
@@ -7,4 +7,4 @@
 class OverflowException
     extends Exception\OverflowException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Table/Exception/UnexpectedValueException.php b/library/Zend/Text/Table/Exception/UnexpectedValueException.php
index f40cc0933bd..121aa24afc6 100644
--- a/library/Zend/Text/Table/Exception/UnexpectedValueException.php
+++ b/library/Zend/Text/Table/Exception/UnexpectedValueException.php
@@ -7,4 +7,4 @@
 class UnexpectedValueException
     extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Text/Table/Row.php b/library/Zend/Text/Table/Row.php
index 531bd2a1140..7cce01e3984 100644
--- a/library/Zend/Text/Table/Row.php
+++ b/library/Zend/Text/Table/Row.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Table;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Row
 {
diff --git a/library/Zend/Text/Table/Table.php b/library/Zend/Text/Table/Table.php
index 1242e034d02..fbea1194bca 100644
--- a/library/Zend/Text/Table/Table.php
+++ b/library/Zend/Text/Table/Table.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Text\Table;
@@ -30,8 +28,6 @@
  *
  * @category  Zend
  * @package   Zend_Text_Table
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Table
 {
diff --git a/library/Zend/TimeSync/AbstractProtocol.php b/library/Zend/TimeSync/AbstractProtocol.php
index 4bc3f0cf36a..a9da724c4e6 100644
--- a/library/Zend/TimeSync/AbstractProtocol.php
+++ b/library/Zend/TimeSync/AbstractProtocol.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractProtocol
 {
diff --git a/library/Zend/TimeSync/Exception/ExceptionInterface.php b/library/Zend/TimeSync/Exception/ExceptionInterface.php
index 66964e54bee..a098302936d 100644
--- a/library/Zend/TimeSync/Exception/ExceptionInterface.php
+++ b/library/Zend/TimeSync/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync\Exception;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/TimeSync/Exception/InvalidArgumentException.php b/library/Zend/TimeSync/Exception/InvalidArgumentException.php
index 7f5a880ada3..1cf5e0471c8 100644
--- a/library/Zend/TimeSync/Exception/InvalidArgumentException.php
+++ b/library/Zend/TimeSync/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/library/Zend/TimeSync/Exception/OutOfBoundsException.php b/library/Zend/TimeSync/Exception/OutOfBoundsException.php
index a82e0ca34b2..597399e0d3b 100644
--- a/library/Zend/TimeSync/Exception/OutOfBoundsException.php
+++ b/library/Zend/TimeSync/Exception/OutOfBoundsException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
diff --git a/library/Zend/TimeSync/Exception/RuntimeException.php b/library/Zend/TimeSync/Exception/RuntimeException.php
index bcaf079e2bf..b88bf33e7b8 100644
--- a/library/Zend/TimeSync/Exception/RuntimeException.php
+++ b/library/Zend/TimeSync/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync\Exception;
@@ -26,8 +24,6 @@
  *
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/library/Zend/TimeSync/Ntp.php b/library/Zend/TimeSync/Ntp.php
index 61e8b92c1a7..c344ebb6d7f 100644
--- a/library/Zend/TimeSync/Ntp.php
+++ b/library/Zend/TimeSync/Ntp.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ntp extends AbstractProtocol
 {
diff --git a/library/Zend/TimeSync/Sntp.php b/library/Zend/TimeSync/Sntp.php
index a7741c49e0e..d2f96c8554c 100644
--- a/library/Zend/TimeSync/Sntp.php
+++ b/library/Zend/TimeSync/Sntp.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_TimeSync
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sntp extends AbstractProtocol
 {
diff --git a/library/Zend/TimeSync/TimeSync.php b/library/Zend/TimeSync/TimeSync.php
index b4e1359bb27..545cb4ad87d 100644
--- a/library/Zend/TimeSync/TimeSync.php
+++ b/library/Zend/TimeSync/TimeSync.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\TimeSync;
@@ -28,8 +26,6 @@
 /**
  * @category   Zend
  * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TimeSync implements IteratorAggregate
 {
diff --git a/library/Zend/Uri/Exception/ExceptionInterface.php b/library/Zend/Uri/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index c573306a335..a03a95a7b58
--- a/library/Zend/Uri/Exception/ExceptionInterface.php
+++ b/library/Zend/Uri/Exception/ExceptionInterface.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -15,8 +13,6 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/Uri/Exception/InvalidArgumentException.php b/library/Zend/Uri/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index dfb2a186d1a..fcf626a0f8f
--- a/library/Zend/Uri/Exception/InvalidArgumentException.php
+++ b/library/Zend/Uri/Exception/InvalidArgumentException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
diff --git a/library/Zend/Uri/Exception/InvalidUriException.php b/library/Zend/Uri/Exception/InvalidUriException.php
old mode 100755
new mode 100644
index 1fdab88f2a8..0929d3ab412
--- a/library/Zend/Uri/Exception/InvalidUriException.php
+++ b/library/Zend/Uri/Exception/InvalidUriException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -15,8 +13,6 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidUriException extends InvalidArgumentException implements ExceptionInterface
 {}
diff --git a/library/Zend/Uri/Exception/InvalidUriPartException.php b/library/Zend/Uri/Exception/InvalidUriPartException.php
old mode 100755
new mode 100644
index 48088ef8265..60b684d702b
--- a/library/Zend/Uri/Exception/InvalidUriPartException.php
+++ b/library/Zend/Uri/Exception/InvalidUriPartException.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -14,8 +12,6 @@
  * @category   Zend
  * @package    Zend_Uri
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidUriPartException extends InvalidArgumentException
 {
diff --git a/library/Zend/Uri/File.php b/library/Zend/Uri/File.php
old mode 100755
new mode 100644
index 1481325c00f..ba967e3543c
--- a/library/Zend/Uri/File.php
+++ b/library/Zend/Uri/File.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -17,8 +15,6 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class File extends Uri
 {
diff --git a/library/Zend/Uri/Http.php b/library/Zend/Uri/Http.php
old mode 100755
new mode 100644
index 64a0e1209d0..2e5029c4b66
--- a/library/Zend/Uri/Http.php
+++ b/library/Zend/Uri/Http.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -15,8 +13,6 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Http extends Uri
 {
diff --git a/library/Zend/Uri/Mailto.php b/library/Zend/Uri/Mailto.php
old mode 100755
new mode 100644
index 53cab337d90..212dfce9c8d
--- a/library/Zend/Uri/Mailto.php
+++ b/library/Zend/Uri/Mailto.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -20,8 +18,6 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Mailto extends Uri
 {
diff --git a/library/Zend/Uri/Uri.php b/library/Zend/Uri/Uri.php
old mode 100755
new mode 100644
index 6ac9ca7bd1d..67efc1da697
--- a/library/Zend/Uri/Uri.php
+++ b/library/Zend/Uri/Uri.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -17,8 +15,6 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Uri
 {
diff --git a/library/Zend/Uri/UriFactory.php b/library/Zend/Uri/UriFactory.php
old mode 100755
new mode 100644
index fa044dcd264..5545c984aaf
--- a/library/Zend/Uri/UriFactory.php
+++ b/library/Zend/Uri/UriFactory.php
@@ -3,8 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
  */
 
@@ -24,8 +22,6 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class UriFactory
 {
diff --git a/library/Zend/Validator/AbstractValidator.php b/library/Zend/Validator/AbstractValidator.php
index 674d3859e97..b47f87b1bc1 100644
--- a/library/Zend/Validator/AbstractValidator.php
+++ b/library/Zend/Validator/AbstractValidator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -29,8 +27,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractValidator implements ValidatorInterface
 {
diff --git a/library/Zend/Validator/Barcode.php b/library/Zend/Validator/Barcode.php
index ed6c3f5ea46..3a54234cc28 100644
--- a/library/Zend/Validator/Barcode.php
+++ b/library/Zend/Validator/Barcode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Barcode extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Barcode/AbstractAdapter.php b/library/Zend/Validator/Barcode/AbstractAdapter.php
index 7e8e8355665..bdd13a44211 100644
--- a/library/Zend/Validator/Barcode/AbstractAdapter.php
+++ b/library/Zend/Validator/Barcode/AbstractAdapter.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
diff --git a/library/Zend/Validator/Barcode/AdapterInterface.php b/library/Zend/Validator/Barcode/AdapterInterface.php
index 961700501ee..a70e59231fd 100644
--- a/library/Zend/Validator/Barcode/AdapterInterface.php
+++ b/library/Zend/Validator/Barcode/AdapterInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AdapterInterface
 {
diff --git a/library/Zend/Validator/Barcode/Codabar.php b/library/Zend/Validator/Barcode/Codabar.php
index be7ab696b20..08fec875bd6 100644
--- a/library/Zend/Validator/Barcode/Codabar.php
+++ b/library/Zend/Validator/Barcode/Codabar.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Codabar extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Code128.php b/library/Zend/Validator/Barcode/Code128.php
index 5eb6f4833df..569c3a11aeb 100644
--- a/library/Zend/Validator/Barcode/Code128.php
+++ b/library/Zend/Validator/Barcode/Code128.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code128 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Code25.php b/library/Zend/Validator/Barcode/Code25.php
index ecfdb1bde41..28989727438 100644
--- a/library/Zend/Validator/Barcode/Code25.php
+++ b/library/Zend/Validator/Barcode/Code25.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code25 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Code25interleaved.php b/library/Zend/Validator/Barcode/Code25interleaved.php
index 86331da99c0..a366e082be7 100644
--- a/library/Zend/Validator/Barcode/Code25interleaved.php
+++ b/library/Zend/Validator/Barcode/Code25interleaved.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code25interleaved extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Code39.php b/library/Zend/Validator/Barcode/Code39.php
index f977d1844f9..5a13b65c961 100644
--- a/library/Zend/Validator/Barcode/Code39.php
+++ b/library/Zend/Validator/Barcode/Code39.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code39 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Code39ext.php b/library/Zend/Validator/Barcode/Code39ext.php
index ce68af3310a..803003ba7ba 100644
--- a/library/Zend/Validator/Barcode/Code39ext.php
+++ b/library/Zend/Validator/Barcode/Code39ext.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code39ext extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Code93.php b/library/Zend/Validator/Barcode/Code93.php
index 8d02e7685b2..1fa7e94593e 100644
--- a/library/Zend/Validator/Barcode/Code93.php
+++ b/library/Zend/Validator/Barcode/Code93.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code93 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Code93ext.php b/library/Zend/Validator/Barcode/Code93ext.php
index f5ab1328fdc..7aa421185fd 100644
--- a/library/Zend/Validator/Barcode/Code93ext.php
+++ b/library/Zend/Validator/Barcode/Code93ext.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Code93ext extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Ean12.php b/library/Zend/Validator/Barcode/Ean12.php
index 8bda750e5a9..906056f6300 100644
--- a/library/Zend/Validator/Barcode/Ean12.php
+++ b/library/Zend/Validator/Barcode/Ean12.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean12 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Ean13.php b/library/Zend/Validator/Barcode/Ean13.php
index 5b1fb5ff21f..e7e7f62a776 100644
--- a/library/Zend/Validator/Barcode/Ean13.php
+++ b/library/Zend/Validator/Barcode/Ean13.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean13 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Ean14.php b/library/Zend/Validator/Barcode/Ean14.php
index 492a47d24e3..e2eab8109a9 100644
--- a/library/Zend/Validator/Barcode/Ean14.php
+++ b/library/Zend/Validator/Barcode/Ean14.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean14 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Ean18.php b/library/Zend/Validator/Barcode/Ean18.php
index f4781426d89..fed8dc2199c 100644
--- a/library/Zend/Validator/Barcode/Ean18.php
+++ b/library/Zend/Validator/Barcode/Ean18.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean18 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Ean2.php b/library/Zend/Validator/Barcode/Ean2.php
index bd8ab01e894..2841af586cd 100644
--- a/library/Zend/Validator/Barcode/Ean2.php
+++ b/library/Zend/Validator/Barcode/Ean2.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean2 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Ean5.php b/library/Zend/Validator/Barcode/Ean5.php
index 8fb875018ab..7824fb6dc70 100644
--- a/library/Zend/Validator/Barcode/Ean5.php
+++ b/library/Zend/Validator/Barcode/Ean5.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean5 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Ean8.php b/library/Zend/Validator/Barcode/Ean8.php
index 5cb7d406239..19d695caf99 100644
--- a/library/Zend/Validator/Barcode/Ean8.php
+++ b/library/Zend/Validator/Barcode/Ean8.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ean8 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Gtin12.php b/library/Zend/Validator/Barcode/Gtin12.php
index 60d256b5742..73a8bc7086f 100644
--- a/library/Zend/Validator/Barcode/Gtin12.php
+++ b/library/Zend/Validator/Barcode/Gtin12.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Gtin12 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Gtin13.php b/library/Zend/Validator/Barcode/Gtin13.php
index 58ddb87ed6c..574696b17b3 100644
--- a/library/Zend/Validator/Barcode/Gtin13.php
+++ b/library/Zend/Validator/Barcode/Gtin13.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Gtin13 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Gtin14.php b/library/Zend/Validator/Barcode/Gtin14.php
index 7c9629b7419..51761778cce 100644
--- a/library/Zend/Validator/Barcode/Gtin14.php
+++ b/library/Zend/Validator/Barcode/Gtin14.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Gtin14 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Identcode.php b/library/Zend/Validator/Barcode/Identcode.php
index 4afd5824c22..8367763b769 100644
--- a/library/Zend/Validator/Barcode/Identcode.php
+++ b/library/Zend/Validator/Barcode/Identcode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Identcode extends AbstractAdapter
 {
@@ -55,4 +51,4 @@ public function __construct()
         $this->setCharacters('0123456789');
         $this->setChecksum('identcode');
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Validator/Barcode/Intelligentmail.php b/library/Zend/Validator/Barcode/Intelligentmail.php
index a9e5d5d27c5..03c9df7d612 100644
--- a/library/Zend/Validator/Barcode/Intelligentmail.php
+++ b/library/Zend/Validator/Barcode/Intelligentmail.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Intelligentmail extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Issn.php b/library/Zend/Validator/Barcode/Issn.php
index a12d42f0e0e..86746b4eddf 100644
--- a/library/Zend/Validator/Barcode/Issn.php
+++ b/library/Zend/Validator/Barcode/Issn.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Issn extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Itf14.php b/library/Zend/Validator/Barcode/Itf14.php
index a8067627cfc..2b4ecf061c4 100644
--- a/library/Zend/Validator/Barcode/Itf14.php
+++ b/library/Zend/Validator/Barcode/Itf14.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Itf14 extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Leitcode.php b/library/Zend/Validator/Barcode/Leitcode.php
index cde4c3dc5df..6eb4c4b10aa 100644
--- a/library/Zend/Validator/Barcode/Leitcode.php
+++ b/library/Zend/Validator/Barcode/Leitcode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Leitcode extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Planet.php b/library/Zend/Validator/Barcode/Planet.php
index 26002a1fcdb..f0e0fbd30d2 100644
--- a/library/Zend/Validator/Barcode/Planet.php
+++ b/library/Zend/Validator/Barcode/Planet.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Planet extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Postnet.php b/library/Zend/Validator/Barcode/Postnet.php
index a96a5874d99..395182571d7 100644
--- a/library/Zend/Validator/Barcode/Postnet.php
+++ b/library/Zend/Validator/Barcode/Postnet.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Postnet extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Royalmail.php b/library/Zend/Validator/Barcode/Royalmail.php
index e732876f6c3..0ec64e7c8f1 100644
--- a/library/Zend/Validator/Barcode/Royalmail.php
+++ b/library/Zend/Validator/Barcode/Royalmail.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Royalmail extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Sscc.php b/library/Zend/Validator/Barcode/Sscc.php
index c817112dfd9..53cf0870f94 100644
--- a/library/Zend/Validator/Barcode/Sscc.php
+++ b/library/Zend/Validator/Barcode/Sscc.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sscc extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Upca.php b/library/Zend/Validator/Barcode/Upca.php
index 3aa23fa3614..cd12fccdf1e 100644
--- a/library/Zend/Validator/Barcode/Upca.php
+++ b/library/Zend/Validator/Barcode/Upca.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Upca extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Barcode/Upce.php b/library/Zend/Validator/Barcode/Upce.php
index 3e24b178259..9b701731116 100644
--- a/library/Zend/Validator/Barcode/Upce.php
+++ b/library/Zend/Validator/Barcode/Upce.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Barcode;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Upce extends AbstractAdapter
 {
diff --git a/library/Zend/Validator/Between.php b/library/Zend/Validator/Between.php
index 542b34c1020..cde8cfa31f2 100644
--- a/library/Zend/Validator/Between.php
+++ b/library/Zend/Validator/Between.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Between extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Callback.php b/library/Zend/Validator/Callback.php
index 3b4d82a815e..5d3861c706d 100644
--- a/library/Zend/Validator/Callback.php
+++ b/library/Zend/Validator/Callback.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Callback extends AbstractValidator
 {
diff --git a/library/Zend/Validator/CreditCard.php b/library/Zend/Validator/CreditCard.php
index 14a44dae2a1..323677cb387 100644
--- a/library/Zend/Validator/CreditCard.php
+++ b/library/Zend/Validator/CreditCard.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CreditCard extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Csrf.php b/library/Zend/Validator/Csrf.php
index c3396da6c3d..137f6d01576 100644
--- a/library/Zend/Validator/Csrf.php
+++ b/library/Zend/Validator/Csrf.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Validator
  * @subpackage UnitTest
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
diff --git a/library/Zend/Validator/Date.php b/library/Zend/Validator/Date.php
index bae5c1c85e8..1f9e752da9d 100644
--- a/library/Zend/Validator/Date.php
+++ b/library/Zend/Validator/Date.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Date extends AbstractValidator
 {
diff --git a/library/Zend/Validator/DateStep.php b/library/Zend/Validator/DateStep.php
index da9c1ac1832..8492aa016e8 100644
--- a/library/Zend/Validator/DateStep.php
+++ b/library/Zend/Validator/DateStep.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -31,8 +29,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DateStep extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Db/AbstractDb.php b/library/Zend/Validator/Db/AbstractDb.php
index 4c1e39e9f60..0a0655f12fa 100644
--- a/library/Zend/Validator/Db/AbstractDb.php
+++ b/library/Zend/Validator/Db/AbstractDb.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Db;
@@ -33,8 +31,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractDb extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Db/NoRecordExists.php b/library/Zend/Validator/Db/NoRecordExists.php
index 50a495a86bc..8d47fdfe503 100644
--- a/library/Zend/Validator/Db/NoRecordExists.php
+++ b/library/Zend/Validator/Db/NoRecordExists.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Db;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NoRecordExists extends AbstractDb
 {
diff --git a/library/Zend/Validator/Db/RecordExists.php b/library/Zend/Validator/Db/RecordExists.php
index 37eadfbcf40..1eefad84f91 100644
--- a/library/Zend/Validator/Db/RecordExists.php
+++ b/library/Zend/Validator/Db/RecordExists.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Db;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RecordExists extends AbstractDb
 {
diff --git a/library/Zend/Validator/Digits.php b/library/Zend/Validator/Digits.php
index a921e5ae0ff..ca592794c3a 100644
--- a/library/Zend/Validator/Digits.php
+++ b/library/Zend/Validator/Digits.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Digits extends AbstractValidator
 {
diff --git a/library/Zend/Validator/EmailAddress.php b/library/Zend/Validator/EmailAddress.php
index 4f44426435f..063b34a2f47 100644
--- a/library/Zend/Validator/EmailAddress.php
+++ b/library/Zend/Validator/EmailAddress.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EmailAddress extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Exception/BadMethodCallException.php b/library/Zend/Validator/Exception/BadMethodCallException.php
index 1fdc0a18c35..1263a982080 100644
--- a/library/Zend/Validator/Exception/BadMethodCallException.php
+++ b/library/Zend/Validator/Exception/BadMethodCallException.php
@@ -4,4 +4,4 @@
 
 class BadMethodCallException extends \BadMethodCallException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Validator/Exception/ExceptionInterface.php b/library/Zend/Validator/Exception/ExceptionInterface.php
index aaf554af123..64645055cf5 100644
--- a/library/Zend/Validator/Exception/ExceptionInterface.php
+++ b/library/Zend/Validator/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Validator/Exception/ExtensionNotLoadedException.php b/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
index 0c3ced3a7d0..caa69fd54eb 100644
--- a/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
@@ -3,4 +3,4 @@
 namespace Zend\Validator\Exception;
 
 class ExtensionNotLoadedException extends RuntimeException
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Validator/Exception/InvalidArgumentException.php b/library/Zend/Validator/Exception/InvalidArgumentException.php
index ad8571f9e0e..8759d32459c 100644
--- a/library/Zend/Validator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Validator/Exception/InvalidArgumentException.php
@@ -4,4 +4,4 @@
 
 class InvalidArgumentException extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php b/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
index 09a890de376..ac05d39b063 100644
--- a/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
+++ b/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
@@ -3,4 +3,4 @@
 namespace Zend\Validator\Exception;
 
 class InvalidMagicMimeFileException extends InvalidArgumentException
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Validator/Exception/RuntimeException.php b/library/Zend/Validator/Exception/RuntimeException.php
index 6e35f49b5c9..e04a5fa8373 100644
--- a/library/Zend/Validator/Exception/RuntimeException.php
+++ b/library/Zend/Validator/Exception/RuntimeException.php
@@ -4,4 +4,4 @@
 
 class RuntimeException extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Validator/Explode.php b/library/Zend/Validator/Explode.php
index ceb986d179c..357379a7913 100644
--- a/library/Zend/Validator/Explode.php
+++ b/library/Zend/Validator/Explode.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Explode extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/Count.php b/library/Zend/Validator/File/Count.php
index 5f5c65dd5b5..f619620907e 100644
--- a/library/Zend/Validator/File/Count.php
+++ b/library/Zend/Validator/File/Count.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Count extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/Crc32.php b/library/Zend/Validator/File/Crc32.php
index 171ed367a0f..14d95d5cd74 100644
--- a/library/Zend/Validator/File/Crc32.php
+++ b/library/Zend/Validator/File/Crc32.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Crc32 extends Hash
 {
diff --git a/library/Zend/Validator/File/ExcludeExtension.php b/library/Zend/Validator/File/ExcludeExtension.php
index 989dffe6b75..035e172b7e3 100644
--- a/library/Zend/Validator/File/ExcludeExtension.php
+++ b/library/Zend/Validator/File/ExcludeExtension.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExcludeExtension extends Extension
 {
diff --git a/library/Zend/Validator/File/ExcludeMimeType.php b/library/Zend/Validator/File/ExcludeMimeType.php
index 9d91ce5400f..4f1894940b7 100644
--- a/library/Zend/Validator/File/ExcludeMimeType.php
+++ b/library/Zend/Validator/File/ExcludeMimeType.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ExcludeMimeType extends MimeType
 {
diff --git a/library/Zend/Validator/File/Exists.php b/library/Zend/Validator/File/Exists.php
index 261bcf4ccb4..bb4ef72c9ba 100644
--- a/library/Zend/Validator/File/Exists.php
+++ b/library/Zend/Validator/File/Exists.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Exists extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/Extension.php b/library/Zend/Validator/File/Extension.php
index 24159b1c769..9ac0fe2bc5e 100644
--- a/library/Zend/Validator/File/Extension.php
+++ b/library/Zend/Validator/File/Extension.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -29,8 +27,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Extension extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/FilesSize.php b/library/Zend/Validator/File/FilesSize.php
index dfdd193e773..7a852ffa122 100644
--- a/library/Zend/Validator/File/FilesSize.php
+++ b/library/Zend/Validator/File/FilesSize.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -29,8 +27,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilesSize extends Size
 {
diff --git a/library/Zend/Validator/File/Hash.php b/library/Zend/Validator/File/Hash.php
index 1845676256f..87b80d7df03 100644
--- a/library/Zend/Validator/File/Hash.php
+++ b/library/Zend/Validator/File/Hash.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hash extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/ImageSize.php b/library/Zend/Validator/File/ImageSize.php
index dde96cf987b..614ea887d4b 100644
--- a/library/Zend/Validator/File/ImageSize.php
+++ b/library/Zend/Validator/File/ImageSize.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ImageSize extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/IsCompressed.php b/library/Zend/Validator/File/IsCompressed.php
index b711e8aa42e..5ce572267f7 100644
--- a/library/Zend/Validator/File/IsCompressed.php
+++ b/library/Zend/Validator/File/IsCompressed.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IsCompressed extends MimeType
 {
diff --git a/library/Zend/Validator/File/IsImage.php b/library/Zend/Validator/File/IsImage.php
index 99f876de8e4..b5f87a2319d 100644
--- a/library/Zend/Validator/File/IsImage.php
+++ b/library/Zend/Validator/File/IsImage.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IsImage extends MimeType
 {
diff --git a/library/Zend/Validator/File/Md5.php b/library/Zend/Validator/File/Md5.php
index eb58c8a6f88..f89f5092c22 100644
--- a/library/Zend/Validator/File/Md5.php
+++ b/library/Zend/Validator/File/Md5.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Md5 extends Hash
 {
diff --git a/library/Zend/Validator/File/MimeType.php b/library/Zend/Validator/File/MimeType.php
index 1422abff238..b01f01f8be9 100644
--- a/library/Zend/Validator/File/MimeType.php
+++ b/library/Zend/Validator/File/MimeType.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -30,8 +28,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class MimeType extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/NotExists.php b/library/Zend/Validator/File/NotExists.php
index f6e6f22e69a..423fad638eb 100644
--- a/library/Zend/Validator/File/NotExists.php
+++ b/library/Zend/Validator/File/NotExists.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NotExists extends Exists
 {
diff --git a/library/Zend/Validator/File/Sha1.php b/library/Zend/Validator/File/Sha1.php
index 2b680fe8ca7..43d285301be 100644
--- a/library/Zend/Validator/File/Sha1.php
+++ b/library/Zend/Validator/File/Sha1.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -27,8 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sha1 extends Hash
 {
diff --git a/library/Zend/Validator/File/Size.php b/library/Zend/Validator/File/Size.php
index 695ad560a66..c5b3f3a6449 100644
--- a/library/Zend/Validator/File/Size.php
+++ b/library/Zend/Validator/File/Size.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validator
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Size extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/Upload.php b/library/Zend/Validator/File/Upload.php
index 1cf7d4449fb..0a36997ac06 100644
--- a/library/Zend/Validator/File/Upload.php
+++ b/library/Zend/Validator/File/Upload.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -28,8 +26,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Upload extends AbstractValidator
 {
diff --git a/library/Zend/Validator/File/WordCount.php b/library/Zend/Validator/File/WordCount.php
index 06b8ebdd977..7ce8013fd3e 100644
--- a/library/Zend/Validator/File/WordCount.php
+++ b/library/Zend/Validator/File/WordCount.php
@@ -14,8 +14,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\File;
@@ -25,8 +23,6 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class WordCount extends Count
 {
diff --git a/library/Zend/Validator/GreaterThan.php b/library/Zend/Validator/GreaterThan.php
index a00f09cdaa4..f3b3af767fd 100644
--- a/library/Zend/Validator/GreaterThan.php
+++ b/library/Zend/Validator/GreaterThan.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class GreaterThan extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Hex.php b/library/Zend/Validator/Hex.php
index 75ceb596620..61f74c9517e 100644
--- a/library/Zend/Validator/Hex.php
+++ b/library/Zend/Validator/Hex.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hex extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Hostname.php b/library/Zend/Validator/Hostname.php
index 9b4b4b5c0a6..108a0298c6a 100644
--- a/library/Zend/Validator/Hostname.php
+++ b/library/Zend/Validator/Hostname.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Hostname extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Hostname/Biz.php b/library/Zend/Validator/Hostname/Biz.php
index bf0bbf88932..96bee5e55ce 100644
--- a/library/Zend/Validator/Hostname/Biz.php
+++ b/library/Zend/Validator/Hostname/Biz.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Hostname;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
     1  => '/^[\x{002d}0-9a-zäåæéöøü]{1,63}$/iu',
diff --git a/library/Zend/Validator/Hostname/Cn.php b/library/Zend/Validator/Hostname/Cn.php
index dfcb120b227..856e60a9745 100644
--- a/library/Zend/Validator/Hostname/Cn.php
+++ b/library/Zend/Validator/Hostname/Cn.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Hostname;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
     1  => '/^[\x{002d}0-9a-z\x{3447}\x{3473}\x{359E}\x{360E}\x{361A}\x{3918}\x{396E}\x{39CF}\x{39D0}' .
diff --git a/library/Zend/Validator/Hostname/Com.php b/library/Zend/Validator/Hostname/Com.php
index 00d563b88ae..7ecba864526 100644
--- a/library/Zend/Validator/Hostname/Com.php
+++ b/library/Zend/Validator/Hostname/Com.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Hostname;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
     1  => '/^[\x{002d}0-9\x{0400}-\x{052f}]{1,63}$/iu',
diff --git a/library/Zend/Validator/Hostname/Jp.php b/library/Zend/Validator/Hostname/Jp.php
index 653348b2034..ba610f334b5 100644
--- a/library/Zend/Validator/Hostname/Jp.php
+++ b/library/Zend/Validator/Hostname/Jp.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Hostname;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
     1  => '/^[\x{002d}0-9a-z\x{3005}-\x{3007}\x{3041}-\x{3093}\x{309D}\x{309E}' .
diff --git a/library/Zend/Validator/Identical.php b/library/Zend/Validator/Identical.php
index fa4ff93b001..94aecab858e 100644
--- a/library/Zend/Validator/Identical.php
+++ b/library/Zend/Validator/Identical.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Identical extends AbstractValidator
 {
diff --git a/library/Zend/Validator/InArray.php b/library/Zend/Validator/InArray.php
index b180a956449..a5093e09f05 100644
--- a/library/Zend/Validator/InArray.php
+++ b/library/Zend/Validator/InArray.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InArray extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Ip.php b/library/Zend/Validator/Ip.php
index d1ebb050487..018effadd24 100644
--- a/library/Zend/Validator/Ip.php
+++ b/library/Zend/Validator/Ip.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ip extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Isbn.php b/library/Zend/Validator/Isbn.php
index 3c52272f8fa..aabbb4c0b62 100644
--- a/library/Zend/Validator/Isbn.php
+++ b/library/Zend/Validator/Isbn.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Isbn extends AbstractValidator
 {
diff --git a/library/Zend/Validator/LessThan.php b/library/Zend/Validator/LessThan.php
index 208e1d71948..ede94d175f9 100644
--- a/library/Zend/Validator/LessThan.php
+++ b/library/Zend/Validator/LessThan.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class LessThan extends AbstractValidator
 {
diff --git a/library/Zend/Validator/NotEmpty.php b/library/Zend/Validator/NotEmpty.php
index 763e4955df7..d187b51eb94 100644
--- a/library/Zend/Validator/NotEmpty.php
+++ b/library/Zend/Validator/NotEmpty.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class NotEmpty extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Regex.php b/library/Zend/Validator/Regex.php
index 537405c1b0e..1faef8e1f0b 100644
--- a/library/Zend/Validator/Regex.php
+++ b/library/Zend/Validator/Regex.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Regex extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Sitemap/Changefreq.php b/library/Zend/Validator/Sitemap/Changefreq.php
index 28fbb87a736..ba710f64515 100644
--- a/library/Zend/Validator/Sitemap/Changefreq.php
+++ b/library/Zend/Validator/Sitemap/Changefreq.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Sitemap;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Changefreq extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Sitemap/Lastmod.php b/library/Zend/Validator/Sitemap/Lastmod.php
index 8c0655b402a..491d6fb3b22 100644
--- a/library/Zend/Validator/Sitemap/Lastmod.php
+++ b/library/Zend/Validator/Sitemap/Lastmod.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Sitemap;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Lastmod extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Sitemap/Loc.php b/library/Zend/Validator/Sitemap/Loc.php
index d2487c9706b..4cf93c2e7bc 100644
--- a/library/Zend/Validator/Sitemap/Loc.php
+++ b/library/Zend/Validator/Sitemap/Loc.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Sitemap;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Loc extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Sitemap/Priority.php b/library/Zend/Validator/Sitemap/Priority.php
index f576bd8de5f..0690b5d12c9 100644
--- a/library/Zend/Validator/Sitemap/Priority.php
+++ b/library/Zend/Validator/Sitemap/Priority.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator\Sitemap;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Priority extends AbstractValidator
 {
diff --git a/library/Zend/Validator/StaticValidator.php b/library/Zend/Validator/StaticValidator.php
index f38e9a24698..512b6398a12 100644
--- a/library/Zend/Validator/StaticValidator.php
+++ b/library/Zend/Validator/StaticValidator.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StaticValidator
 {
diff --git a/library/Zend/Validator/Step.php b/library/Zend/Validator/Step.php
index e85f9bb00bd..bb5d0f7cb4f 100644
--- a/library/Zend/Validator/Step.php
+++ b/library/Zend/Validator/Step.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Step extends AbstractValidator
 {
diff --git a/library/Zend/Validator/StringLength.php b/library/Zend/Validator/StringLength.php
index 226ae682e11..0e71b9a7957 100644
--- a/library/Zend/Validator/StringLength.php
+++ b/library/Zend/Validator/StringLength.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StringLength extends AbstractValidator
 {
diff --git a/library/Zend/Validator/Uri.php b/library/Zend/Validator/Uri.php
index 97a11445c2f..c875cfad44c 100644
--- a/library/Zend/Validator/Uri.php
+++ b/library/Zend/Validator/Uri.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Uri extends AbstractValidator
 {
diff --git a/library/Zend/Validator/ValidatorChain.php b/library/Zend/Validator/ValidatorChain.php
index 8f0c3eac3d2..c3a40eac8f1 100644
--- a/library/Zend/Validator/ValidatorChain.php
+++ b/library/Zend/Validator/ValidatorChain.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ValidatorChain implements
     Countable,
@@ -217,4 +213,4 @@ public function __invoke($value)
     {
         return $this->isValid($value);
     }
-}
\ No newline at end of file
+}
diff --git a/library/Zend/Validator/ValidatorInterface.php b/library/Zend/Validator/ValidatorInterface.php
index 1636f671556..077577e9403 100644
--- a/library/Zend/Validator/ValidatorInterface.php
+++ b/library/Zend/Validator/ValidatorInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ValidatorInterface
 {
diff --git a/library/Zend/Validator/ValidatorPluginManager.php b/library/Zend/Validator/ValidatorPluginManager.php
index cd675412834..5f751046db8 100644
--- a/library/Zend/Validator/ValidatorPluginManager.php
+++ b/library/Zend/Validator/ValidatorPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Validator;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Validator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ValidatorPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/Version.php b/library/Zend/Version.php
index a638cbd4073..df191965006 100644
--- a/library/Zend/Version.php
+++ b/library/Zend/Version.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Version
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_Version
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class Version
 {
diff --git a/library/Zend/View/Exception/BadMethodCallException.php b/library/Zend/View/Exception/BadMethodCallException.php
index f1bcde487f1..b2795914c90 100644
--- a/library/Zend/View/Exception/BadMethodCallException.php
+++ b/library/Zend/View/Exception/BadMethodCallException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BadMethodCallException
     extends \BadMethodCallException
diff --git a/library/Zend/View/Exception/DomainException.php b/library/Zend/View/Exception/DomainException.php
index 7f4b486576a..ea360f9ea21 100644
--- a/library/Zend/View/Exception/DomainException.php
+++ b/library/Zend/View/Exception/DomainException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DomainException
     extends \DomainException
diff --git a/library/Zend/View/Exception/ExceptionInterface.php b/library/Zend/View/Exception/ExceptionInterface.php
index 526abb2d441..d820f4261ed 100644
--- a/library/Zend/View/Exception/ExceptionInterface.php
+++ b/library/Zend/View/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/View/Exception/InvalidArgumentException.php b/library/Zend/View/Exception/InvalidArgumentException.php
index c94e2ce150e..c85b2aae6c6 100644
--- a/library/Zend/View/Exception/InvalidArgumentException.php
+++ b/library/Zend/View/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
diff --git a/library/Zend/View/Exception/InvalidHelperException.php b/library/Zend/View/Exception/InvalidHelperException.php
index b12ca5cf59d..5542f55fcf7 100644
--- a/library/Zend/View/Exception/InvalidHelperException.php
+++ b/library/Zend/View/Exception/InvalidHelperException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidHelperException
     extends \Exception
diff --git a/library/Zend/View/Exception/RuntimeException.php b/library/Zend/View/Exception/RuntimeException.php
index b6bdcd0eb59..6bf97434516 100644
--- a/library/Zend/View/Exception/RuntimeException.php
+++ b/library/Zend/View/Exception/RuntimeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Exception;
@@ -25,8 +23,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
diff --git a/library/Zend/View/Helper/AbstractHelper.php b/library/Zend/View/Helper/AbstractHelper.php
index aa4e05cc48f..ae2ba3b274c 100644
--- a/library/Zend/View/Helper/AbstractHelper.php
+++ b/library/Zend/View/Helper/AbstractHelper.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractHelper implements HelperInterface
 {
diff --git a/library/Zend/View/Helper/AbstractHtmlElement.php b/library/Zend/View/Helper/AbstractHtmlElement.php
index 35757a780ca..0e7a354ef20 100644
--- a/library/Zend/View/Helper/AbstractHtmlElement.php
+++ b/library/Zend/View/Helper/AbstractHtmlElement.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractHtmlElement extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/BasePath.php b/library/Zend/View/Helper/BasePath.php
index b0a7cf4c7dd..c4850b1f39d 100644
--- a/library/Zend/View/Helper/BasePath.php
+++ b/library/Zend/View/Helper/BasePath.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BasePath extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Cycle.php b/library/Zend/View/Helper/Cycle.php
index 54cbcbfd7bd..a98c476b5ff 100644
--- a/library/Zend/View/Helper/Cycle.php
+++ b/library/Zend/View/Helper/Cycle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cycle extends AbstractHelper implements \Iterator
 {
diff --git a/library/Zend/View/Helper/DeclareVars.php b/library/Zend/View/Helper/DeclareVars.php
index 2110e9d6ed8..96b47800b59 100644
--- a/library/Zend/View/Helper/DeclareVars.php
+++ b/library/Zend/View/Helper/DeclareVars.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DeclareVars extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Doctype.php b/library/Zend/View/Helper/Doctype.php
index 749b2128495..09bb4ebec99 100644
--- a/library/Zend/View/Helper/Doctype.php
+++ b/library/Zend/View/Helper/Doctype.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Doctype extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/EscapeCss.php b/library/Zend/View/Helper/EscapeCss.php
index e2e116188f9..4dacf576cab 100644
--- a/library/Zend/View/Helper/EscapeCss.php
+++ b/library/Zend/View/Helper/EscapeCss.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EscapeCss extends Escaper\AbstractHelper
 {
diff --git a/library/Zend/View/Helper/EscapeHtml.php b/library/Zend/View/Helper/EscapeHtml.php
index bec5da1e46b..cd678a95465 100644
--- a/library/Zend/View/Helper/EscapeHtml.php
+++ b/library/Zend/View/Helper/EscapeHtml.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EscapeHtml extends Escaper\AbstractHelper
 {
diff --git a/library/Zend/View/Helper/EscapeHtmlAttr.php b/library/Zend/View/Helper/EscapeHtmlAttr.php
index a1cc9121c03..1ae28eb1a73 100644
--- a/library/Zend/View/Helper/EscapeHtmlAttr.php
+++ b/library/Zend/View/Helper/EscapeHtmlAttr.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EscapeHtmlAttr extends Escaper\AbstractHelper
 {
diff --git a/library/Zend/View/Helper/EscapeJs.php b/library/Zend/View/Helper/EscapeJs.php
index 9fe52ba0f3d..05474048ff7 100644
--- a/library/Zend/View/Helper/EscapeJs.php
+++ b/library/Zend/View/Helper/EscapeJs.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EscapeJs extends Escaper\AbstractHelper
 {
diff --git a/library/Zend/View/Helper/EscapeUrl.php b/library/Zend/View/Helper/EscapeUrl.php
index ca787102402..30f44ab9adc 100644
--- a/library/Zend/View/Helper/EscapeUrl.php
+++ b/library/Zend/View/Helper/EscapeUrl.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class EscapeUrl extends Escaper\AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Escaper/AbstractHelper.php b/library/Zend/View/Helper/Escaper/AbstractHelper.php
index c01e0f37c5a..3d110a2e583 100644
--- a/library/Zend/View/Helper/Escaper/AbstractHelper.php
+++ b/library/Zend/View/Helper/Escaper/AbstractHelper.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Escaper;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractHelper extends Helper\AbstractHelper
 {
@@ -148,4 +144,4 @@ public function __invoke($value, $recurse = self::RECURSE_NONE)
      */
     protected abstract function escape($value);
 
-}
\ No newline at end of file
+}
diff --git a/library/Zend/View/Helper/Gravatar.php b/library/Zend/View/Helper/Gravatar.php
index 8c833bb6476..42a8fceb0f9 100644
--- a/library/Zend/View/Helper/Gravatar.php
+++ b/library/Zend/View/Helper/Gravatar.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend\View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend\View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Gravatar extends AbstractHtmlElement
 {
diff --git a/library/Zend/View/Helper/HeadLink.php b/library/Zend/View/Helper/HeadLink.php
index 11b07fb5e2a..348613f2ec4 100644
--- a/library/Zend/View/Helper/HeadLink.php
+++ b/library/Zend/View/Helper/HeadLink.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -30,8 +28,6 @@
  * @see        http://www.w3.org/TR/xhtml1/dtds.html
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HeadLink extends Placeholder\Container\AbstractStandalone
 {
diff --git a/library/Zend/View/Helper/HeadMeta.php b/library/Zend/View/Helper/HeadMeta.php
index 039b2a2cdbe..4205a05c3b6 100644
--- a/library/Zend/View/Helper/HeadMeta.php
+++ b/library/Zend/View/Helper/HeadMeta.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -30,8 +28,6 @@
  * @see        http://www.w3.org/TR/xhtml1/dtds.html
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HeadMeta extends Placeholder\Container\AbstractStandalone
 {
diff --git a/library/Zend/View/Helper/HeadScript.php b/library/Zend/View/Helper/HeadScript.php
index ed18bd67bb7..9045bc1741e 100644
--- a/library/Zend/View/Helper/HeadScript.php
+++ b/library/Zend/View/Helper/HeadScript.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HeadScript extends Placeholder\Container\AbstractStandalone
 {
diff --git a/library/Zend/View/Helper/HeadStyle.php b/library/Zend/View/Helper/HeadStyle.php
index 44e44203704..9fd0b20e57c 100644
--- a/library/Zend/View/Helper/HeadStyle.php
+++ b/library/Zend/View/Helper/HeadStyle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HeadStyle extends Placeholder\Container\AbstractStandalone
 {
diff --git a/library/Zend/View/Helper/HeadTitle.php b/library/Zend/View/Helper/HeadTitle.php
index 15f97d30731..c22fb6057fe 100644
--- a/library/Zend/View/Helper/HeadTitle.php
+++ b/library/Zend/View/Helper/HeadTitle.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HeadTitle extends Placeholder\Container\AbstractStandalone
 {
diff --git a/library/Zend/View/Helper/HelperInterface.php b/library/Zend/View/Helper/HelperInterface.php
index b60ba81be6b..36a603d6199 100644
--- a/library/Zend/View/Helper/HelperInterface.php
+++ b/library/Zend/View/Helper/HelperInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface HelperInterface
 {
diff --git a/library/Zend/View/Helper/HtmlFlash.php b/library/Zend/View/Helper/HtmlFlash.php
index 1fb52b24ea9..7594f00d632 100644
--- a/library/Zend/View/Helper/HtmlFlash.php
+++ b/library/Zend/View/Helper/HtmlFlash.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlFlash extends AbstractHtmlElement
 {
diff --git a/library/Zend/View/Helper/HtmlList.php b/library/Zend/View/Helper/HtmlList.php
index aa9613b3de1..d8970f86ace 100644
--- a/library/Zend/View/Helper/HtmlList.php
+++ b/library/Zend/View/Helper/HtmlList.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlList extends AbstractHtmlElement
 {
diff --git a/library/Zend/View/Helper/HtmlObject.php b/library/Zend/View/Helper/HtmlObject.php
index adcb4f28bb9..f4d492692d7 100644
--- a/library/Zend/View/Helper/HtmlObject.php
+++ b/library/Zend/View/Helper/HtmlObject.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlObject extends AbstractHtmlElement
 {
diff --git a/library/Zend/View/Helper/HtmlPage.php b/library/Zend/View/Helper/HtmlPage.php
index c6f36c7f53e..583dfd91f66 100644
--- a/library/Zend/View/Helper/HtmlPage.php
+++ b/library/Zend/View/Helper/HtmlPage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlPage extends AbstractHtmlElement
 {
diff --git a/library/Zend/View/Helper/HtmlQuicktime.php b/library/Zend/View/Helper/HtmlQuicktime.php
index 295fea891d1..768286f7b09 100644
--- a/library/Zend/View/Helper/HtmlQuicktime.php
+++ b/library/Zend/View/Helper/HtmlQuicktime.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HtmlQuicktime extends AbstractHtmlElement
 {
diff --git a/library/Zend/View/Helper/InlineScript.php b/library/Zend/View/Helper/InlineScript.php
index b7faeabcb95..ce456c3a1aa 100644
--- a/library/Zend/View/Helper/InlineScript.php
+++ b/library/Zend/View/Helper/InlineScript.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InlineScript extends HeadScript
 {
diff --git a/library/Zend/View/Helper/Json.php b/library/Zend/View/Helper/Json.php
index f1c93e2ec66..251bb0caf5f 100644
--- a/library/Zend/View/Helper/Json.php
+++ b/library/Zend/View/Helper/Json.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Json extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Layout.php b/library/Zend/View/Helper/Layout.php
index 7ae0fdd8b96..86699002624 100644
--- a/library/Zend/View/Helper/Layout.php
+++ b/library/Zend/View/Helper/Layout.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Layout extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Navigation.php b/library/Zend/View/Helper/Navigation.php
index 0d334af20a1..1a9531c3b13 100644
--- a/library/Zend/View/Helper/Navigation.php
+++ b/library/Zend/View/Helper/Navigation.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Navigation extends AbstractNavigationHelper
 {
diff --git a/library/Zend/View/Helper/Navigation/AbstractHelper.php b/library/Zend/View/Helper/Navigation/AbstractHelper.php
index 252c0b9fb97..522a0a345ca 100644
--- a/library/Zend/View/Helper/Navigation/AbstractHelper.php
+++ b/library/Zend/View/Helper/Navigation/AbstractHelper.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Navigation;
@@ -37,8 +35,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractHelper
     extends View\Helper\AbstractHtmlElement
diff --git a/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/library/Zend/View/Helper/Navigation/Breadcrumbs.php
index 6fbda7d4edd..01e45abc174 100644
--- a/library/Zend/View/Helper/Navigation/Breadcrumbs.php
+++ b/library/Zend/View/Helper/Navigation/Breadcrumbs.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Navigation;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Breadcrumbs extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Navigation/HelperInterface.php b/library/Zend/View/Helper/Navigation/HelperInterface.php
index f1c3694c688..dbaba10c4a2 100644
--- a/library/Zend/View/Helper/Navigation/HelperInterface.php
+++ b/library/Zend/View/Helper/Navigation/HelperInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Navigation;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface HelperInterface
 {
diff --git a/library/Zend/View/Helper/Navigation/Links.php b/library/Zend/View/Helper/Navigation/Links.php
index 0507e8cb575..b076d3d2852 100644
--- a/library/Zend/View/Helper/Navigation/Links.php
+++ b/library/Zend/View/Helper/Navigation/Links.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Navigation;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Links extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Navigation/Menu.php b/library/Zend/View/Helper/Navigation/Menu.php
index 6c3e66d34f4..12a0a139667 100644
--- a/library/Zend/View/Helper/Navigation/Menu.php
+++ b/library/Zend/View/Helper/Navigation/Menu.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Navigation;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Menu extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Navigation/PluginManager.php b/library/Zend/View/Helper/Navigation/PluginManager.php
index 377b8f5ab4f..75801381aa0 100644
--- a/library/Zend/View/Helper/Navigation/PluginManager.php
+++ b/library/Zend/View/Helper/Navigation/PluginManager.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Navigation;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PluginManager extends HelperPluginManager
 {
diff --git a/library/Zend/View/Helper/Navigation/Sitemap.php b/library/Zend/View/Helper/Navigation/Sitemap.php
index 1790c62051e..c686232c3d0 100644
--- a/library/Zend/View/Helper/Navigation/Sitemap.php
+++ b/library/Zend/View/Helper/Navigation/Sitemap.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Navigation;
@@ -37,8 +35,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Sitemap extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/PaginationControl.php b/library/Zend/View/Helper/PaginationControl.php
index 683684d1631..abae8f46c27 100644
--- a/library/Zend/View/Helper/PaginationControl.php
+++ b/library/Zend/View/Helper/PaginationControl.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -27,8 +25,6 @@
 /**
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PaginationControl extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Partial.php b/library/Zend/View/Helper/Partial.php
index db4410bbd31..47a5ab2d6db 100644
--- a/library/Zend/View/Helper/Partial.php
+++ b/library/Zend/View/Helper/Partial.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Partial extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/PartialLoop.php b/library/Zend/View/Helper/PartialLoop.php
index 244aa90c684..cb79a813cce 100644
--- a/library/Zend/View/Helper/PartialLoop.php
+++ b/library/Zend/View/Helper/PartialLoop.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PartialLoop extends Partial
 {
diff --git a/library/Zend/View/Helper/Placeholder.php b/library/Zend/View/Helper/Placeholder.php
index cc20ec0f37e..de2c36c512f 100644
--- a/library/Zend/View/Helper/Placeholder.php
+++ b/library/Zend/View/Helper/Placeholder.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -31,8 +29,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Placeholder extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Placeholder/Container.php b/library/Zend/View/Helper/Placeholder/Container.php
index bb0f3161e3e..9096a36f214 100644
--- a/library/Zend/View/Helper/Placeholder/Container.php
+++ b/library/Zend/View/Helper/Placeholder/Container.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Placeholder;
@@ -26,8 +24,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Container extends Container\AbstractContainer
 {
diff --git a/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php b/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
index bdcf84d02a9..75fb284033c 100644
--- a/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
+++ b/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Placeholder\Container;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractContainer extends \ArrayObject
 {
diff --git a/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php b/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
index e522ee0c001..14101b54027 100644
--- a/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
+++ b/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Placeholder\Container;
@@ -29,8 +27,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractStandalone
     extends \Zend\View\Helper\AbstractHelper
diff --git a/library/Zend/View/Helper/Placeholder/Registry.php b/library/Zend/View/Helper/Placeholder/Registry.php
index 27cfe19ad97..c114d0eaf0a 100644
--- a/library/Zend/View/Helper/Placeholder/Registry.php
+++ b/library/Zend/View/Helper/Placeholder/Registry.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper\Placeholder;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Registry
 {
diff --git a/library/Zend/View/Helper/RenderChildModel.php b/library/Zend/View/Helper/RenderChildModel.php
index c4f7b22f4da..a5f9b7cf000 100644
--- a/library/Zend/View/Helper/RenderChildModel.php
+++ b/library/Zend/View/Helper/RenderChildModel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -32,8 +30,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RenderChildModel extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/RenderToPlaceholder.php b/library/Zend/View/Helper/RenderToPlaceholder.php
index 3fcb9b0820d..3304e2fcc81 100644
--- a/library/Zend/View/Helper/RenderToPlaceholder.php
+++ b/library/Zend/View/Helper/RenderToPlaceholder.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -27,8 +25,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RenderToPlaceholder extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/ServerUrl.php b/library/Zend/View/Helper/ServerUrl.php
index b36e72ab75c..0f92c9cb384 100644
--- a/library/Zend/View/Helper/ServerUrl.php
+++ b/library/Zend/View/Helper/ServerUrl.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServerUrl extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/Url.php b/library/Zend/View/Helper/Url.php
index 37afefcc0d7..5eee33d1f1b 100644
--- a/library/Zend/View/Helper/Url.php
+++ b/library/Zend/View/Helper/Url.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -30,8 +28,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Url extends AbstractHelper
 {
diff --git a/library/Zend/View/Helper/ViewModel.php b/library/Zend/View/Helper/ViewModel.php
index d76564c9b4a..550a2407ae9 100644
--- a/library/Zend/View/Helper/ViewModel.php
+++ b/library/Zend/View/Helper/ViewModel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Helper;
@@ -28,8 +26,6 @@
  *
  * @package    Zend_View
  * @subpackage Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewModel extends AbstractHelper
 {
diff --git a/library/Zend/View/HelperPluginManager.php b/library/Zend/View/HelperPluginManager.php
index abc865bd7a0..ec69e558fdb 100644
--- a/library/Zend/View/HelperPluginManager.php
+++ b/library/Zend/View/HelperPluginManager.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HelperPluginManager extends AbstractPluginManager
 {
diff --git a/library/Zend/View/Model/FeedModel.php b/library/Zend/View/Model/FeedModel.php
index f6d5dc93ef6..cea14c229d6 100644
--- a/library/Zend/View/Model/FeedModel.php
+++ b/library/Zend/View/Model/FeedModel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Model;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FeedModel extends ViewModel
 {
diff --git a/library/Zend/View/Model/JsonModel.php b/library/Zend/View/Model/JsonModel.php
index e0490c66ac0..af4bfb1825b 100644
--- a/library/Zend/View/Model/JsonModel.php
+++ b/library/Zend/View/Model/JsonModel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Model;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class JsonModel extends ViewModel
 {
diff --git a/library/Zend/View/Model/ModelInterface.php b/library/Zend/View/Model/ModelInterface.php
index 25b06e73d56..2732140c414 100644
--- a/library/Zend/View/Model/ModelInterface.php
+++ b/library/Zend/View/Model/ModelInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Model;
@@ -35,8 +33,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ModelInterface extends Countable, IteratorAggregate
 {
diff --git a/library/Zend/View/Model/ViewModel.php b/library/Zend/View/Model/ViewModel.php
index e467e78eca0..d63672a1f1f 100644
--- a/library/Zend/View/Model/ViewModel.php
+++ b/library/Zend/View/Model/ViewModel.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Model;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Model
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewModel implements ModelInterface
 {
diff --git a/library/Zend/View/Renderer/FeedRenderer.php b/library/Zend/View/Renderer/FeedRenderer.php
index bd6a8e7fbe6..9a293db91b7 100644
--- a/library/Zend/View/Renderer/FeedRenderer.php
+++ b/library/Zend/View/Renderer/FeedRenderer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Renderer;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FeedRenderer implements RendererInterface
 {
diff --git a/library/Zend/View/Renderer/JsonRenderer.php b/library/Zend/View/Renderer/JsonRenderer.php
index 478bac3fb93..aff286770ba 100644
--- a/library/Zend/View/Renderer/JsonRenderer.php
+++ b/library/Zend/View/Renderer/JsonRenderer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Renderer;
@@ -37,8 +35,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class JsonRenderer implements Renderer, TreeRendererInterface
 {
diff --git a/library/Zend/View/Renderer/PhpRenderer.php b/library/Zend/View/Renderer/PhpRenderer.php
index 1de8b3c830c..fdd560382d3 100644
--- a/library/Zend/View/Renderer/PhpRenderer.php
+++ b/library/Zend/View/Renderer/PhpRenderer.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Renderer;
@@ -39,8 +37,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhpRenderer implements Renderer, TreeRendererInterface
 {
diff --git a/library/Zend/View/Renderer/RendererInterface.php b/library/Zend/View/Renderer/RendererInterface.php
index 49f8727d1ff..0b5c01f30cc 100644
--- a/library/Zend/View/Renderer/RendererInterface.php
+++ b/library/Zend/View/Renderer/RendererInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
@@ -29,8 +27,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface RendererInterface
 {
diff --git a/library/Zend/View/Renderer/TreeRendererInterface.php b/library/Zend/View/Renderer/TreeRendererInterface.php
index 56d5214ecd1..51d93fabc71 100644
--- a/library/Zend/View/Renderer/TreeRendererInterface.php
+++ b/library/Zend/View/Renderer/TreeRendererInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Renderer;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface TreeRendererInterface
 {
diff --git a/library/Zend/View/Resolver/AggregateResolver.php b/library/Zend/View/Resolver/AggregateResolver.php
index b045c9cf946..fa4efd3da75 100644
--- a/library/Zend/View/Resolver/AggregateResolver.php
+++ b/library/Zend/View/Resolver/AggregateResolver.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Resolver;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class AggregateResolver implements Countable, IteratorAggregate, ResolverInterface
 {
diff --git a/library/Zend/View/Resolver/ResolverInterface.php b/library/Zend/View/Resolver/ResolverInterface.php
index a782be626c4..894e3e7d787 100644
--- a/library/Zend/View/Resolver/ResolverInterface.php
+++ b/library/Zend/View/Resolver/ResolverInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Resolver;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ResolverInterface
 {
diff --git a/library/Zend/View/Resolver/TemplateMapResolver.php b/library/Zend/View/Resolver/TemplateMapResolver.php
index 6580761321c..9a16dfa4f88 100644
--- a/library/Zend/View/Resolver/TemplateMapResolver.php
+++ b/library/Zend/View/Resolver/TemplateMapResolver.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Resolver;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TemplateMapResolver implements IteratorAggregate, ResolverInterface
 {
diff --git a/library/Zend/View/Resolver/TemplatePathStack.php b/library/Zend/View/Resolver/TemplatePathStack.php
index 3bbe760a413..35c6dc67ea4 100644
--- a/library/Zend/View/Resolver/TemplatePathStack.php
+++ b/library/Zend/View/Resolver/TemplatePathStack.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Resolver;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Resolver
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TemplatePathStack implements ResolverInterface
 {
diff --git a/library/Zend/View/Strategy/FeedStrategy.php b/library/Zend/View/Strategy/FeedStrategy.php
index 7dd47f0ebe0..c83cfb21ff0 100644
--- a/library/Zend/View/Strategy/FeedStrategy.php
+++ b/library/Zend/View/Strategy/FeedStrategy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Strategy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Strategy;
@@ -34,8 +32,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Strategy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FeedStrategy implements ListenerAggregateInterface
 {
diff --git a/library/Zend/View/Strategy/JsonStrategy.php b/library/Zend/View/Strategy/JsonStrategy.php
index 45b6da4ba5f..ed92cba5bd0 100644
--- a/library/Zend/View/Strategy/JsonStrategy.php
+++ b/library/Zend/View/Strategy/JsonStrategy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Strategy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Strategy;
@@ -33,8 +31,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Strategy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class JsonStrategy implements ListenerAggregateInterface
 {
diff --git a/library/Zend/View/Strategy/PhpRendererStrategy.php b/library/Zend/View/Strategy/PhpRendererStrategy.php
index d541f3509a8..39d2467ab53 100644
--- a/library/Zend/View/Strategy/PhpRendererStrategy.php
+++ b/library/Zend/View/Strategy/PhpRendererStrategy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Strategy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View\Strategy;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage Strategy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PhpRendererStrategy implements ListenerAggregateInterface
 {
diff --git a/library/Zend/View/Stream.php b/library/Zend/View/Stream.php
index 5241b310de8..f8bbe0a27bd 100644
--- a/library/Zend/View/Stream.php
+++ b/library/Zend/View/Stream.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View;
@@ -35,8 +33,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Stream
 {
diff --git a/library/Zend/View/Variables.php b/library/Zend/View/Variables.php
index 260f6bb4f61..d56f8befb4d 100644
--- a/library/Zend/View/Variables.php
+++ b/library/Zend/View/Variables.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View;
@@ -30,8 +28,6 @@
  * @todo       Move strict variables into variables object
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Variables extends ArrayObject
 {
diff --git a/library/Zend/View/View.php b/library/Zend/View/View.php
index 457fd151103..71b51e2c52c 100644
--- a/library/Zend/View/View.php
+++ b/library/Zend/View/View.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View;
@@ -33,8 +31,6 @@
 /**
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class View implements EventManagerAwareInterface
 {
diff --git a/library/Zend/View/ViewEvent.php b/library/Zend/View/ViewEvent.php
index 270b1d0c2dc..eadc7f973ec 100644
--- a/library/Zend/View/ViewEvent.php
+++ b/library/Zend/View/ViewEvent.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\View;
@@ -30,8 +28,6 @@
 /**
  * @category   Zend
  * @package    Zend_View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ViewEvent extends Event
 {
diff --git a/library/Zend/Wildfire/Channel.php b/library/Zend/Wildfire/Channel.php
index 0543b91acc9..9d019b6af36 100644
--- a/library/Zend/Wildfire/Channel.php
+++ b/library/Zend/Wildfire/Channel.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Channel
 {
diff --git a/library/Zend/Wildfire/Channel/Exception/ExceptionInterface.php b/library/Zend/Wildfire/Channel/Exception/ExceptionInterface.php
index 7538b67037d..59ea97eb92d 100644
--- a/library/Zend/Wildfire/Channel/Exception/ExceptionInterface.php
+++ b/library/Zend/Wildfire/Channel/Exception/ExceptionInterface.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Channel\Exception;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Channel/Exception/InvalidArgumentException.php b/library/Zend/Wildfire/Channel/Exception/InvalidArgumentException.php
index da367a2a574..e8f6fd33c26 100644
--- a/library/Zend/Wildfire/Channel/Exception/InvalidArgumentException.php
+++ b/library/Zend/Wildfire/Channel/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Channel\Exception;
@@ -28,10 +26,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Channel/Exception/RuntimeException.php b/library/Zend/Wildfire/Channel/Exception/RuntimeException.php
index 3e9eab3b3b3..d4aa21dcbe3 100644
--- a/library/Zend/Wildfire/Channel/Exception/RuntimeException.php
+++ b/library/Zend/Wildfire/Channel/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Channel\Exception;
@@ -28,10 +26,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Channel/HttpHeaders.php b/library/Zend/Wildfire/Channel/HttpHeaders.php
index 6cf38780d85..197e9d0aa4a 100644
--- a/library/Zend/Wildfire/Channel/HttpHeaders.php
+++ b/library/Zend/Wildfire/Channel/HttpHeaders.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Channel
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Channel;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Channel
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpHeaders
     extends Controller\Plugin\AbstractPlugin
diff --git a/library/Zend/Wildfire/Exception/ExceptionInterface.php b/library/Zend/Wildfire/Exception/ExceptionInterface.php
index 8af33deb621..a5176e77e18 100644
--- a/library/Zend/Wildfire/Exception/ExceptionInterface.php
+++ b/library/Zend/Wildfire/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Exception/InvalidArgumentException.php b/library/Zend/Wildfire/Exception/InvalidArgumentException.php
index 1d6c03b7310..1b5a7c6d4ae 100644
--- a/library/Zend/Wildfire/Exception/InvalidArgumentException.php
+++ b/library/Zend/Wildfire/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Exception;
@@ -26,10 +24,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Exception/OutOfBoundsException.php b/library/Zend/Wildfire/Exception/OutOfBoundsException.php
index 2e70f4438b0..b69ad184947 100644
--- a/library/Zend/Wildfire/Exception/OutOfBoundsException.php
+++ b/library/Zend/Wildfire/Exception/OutOfBoundsException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Exception;
@@ -26,10 +24,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException
     extends \OutOfBoundsException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Exception/OutOfRangeException.php b/library/Zend/Wildfire/Exception/OutOfRangeException.php
index 794fd9094b9..0087caa61a4 100644
--- a/library/Zend/Wildfire/Exception/OutOfRangeException.php
+++ b/library/Zend/Wildfire/Exception/OutOfRangeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Exception;
@@ -25,10 +23,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException
     extends \OutOfRangeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Exception/RuntimeException.php b/library/Zend/Wildfire/Exception/RuntimeException.php
index 7a432d0229f..37cadd5b115 100644
--- a/library/Zend/Wildfire/Exception/RuntimeException.php
+++ b/library/Zend/Wildfire/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Exception;
@@ -26,10 +24,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Exception/UnexpectedValueException.php b/library/Zend/Wildfire/Exception/UnexpectedValueException.php
index 5d016b8fd01..08217fa0876 100644
--- a/library/Zend/Wildfire/Exception/UnexpectedValueException.php
+++ b/library/Zend/Wildfire/Exception/UnexpectedValueException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Exception;
@@ -26,10 +24,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException
     extends \UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Plugin.php b/library/Zend/Wildfire/Plugin.php
index 45f3ab376fa..478db1f77ee 100644
--- a/library/Zend/Wildfire/Plugin.php
+++ b/library/Zend/Wildfire/Plugin.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Plugin
 {
diff --git a/library/Zend/Wildfire/Plugin/Exception/ExceptionInterface.php b/library/Zend/Wildfire/Plugin/Exception/ExceptionInterface.php
index 0dfe7ba49d6..94d81d18e35 100644
--- a/library/Zend/Wildfire/Plugin/Exception/ExceptionInterface.php
+++ b/library/Zend/Wildfire/Plugin/Exception/ExceptionInterface.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin\Exception;
@@ -26,8 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Plugin/Exception/InvalidArgumentException.php b/library/Zend/Wildfire/Plugin/Exception/InvalidArgumentException.php
index 43056c610c7..7c8fa810c25 100644
--- a/library/Zend/Wildfire/Plugin/Exception/InvalidArgumentException.php
+++ b/library/Zend/Wildfire/Plugin/Exception/InvalidArgumentException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin\Exception;
@@ -28,10 +26,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Plugin/Exception/OutOfBoundsException.php b/library/Zend/Wildfire/Plugin/Exception/OutOfBoundsException.php
index 1d5537bbab4..357687b39d5 100644
--- a/library/Zend/Wildfire/Plugin/Exception/OutOfBoundsException.php
+++ b/library/Zend/Wildfire/Plugin/Exception/OutOfBoundsException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin\Exception;
@@ -28,10 +26,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfBoundsException
     extends Exception\OutOfBoundsException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Plugin/Exception/RuntimeException.php b/library/Zend/Wildfire/Plugin/Exception/RuntimeException.php
index c59a8d15ccd..f340e6100b0 100644
--- a/library/Zend/Wildfire/Plugin/Exception/RuntimeException.php
+++ b/library/Zend/Wildfire/Plugin/Exception/RuntimeException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin\Exception;
@@ -28,10 +26,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
     extends Exception\RuntimeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Plugin/Exception/UnexpectedValueException.php b/library/Zend/Wildfire/Plugin/Exception/UnexpectedValueException.php
index 2473756690a..a5f83460faf 100644
--- a/library/Zend/Wildfire/Plugin/Exception/UnexpectedValueException.php
+++ b/library/Zend/Wildfire/Plugin/Exception/UnexpectedValueException.php
@@ -14,9 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin\Exception;
@@ -28,10 +26,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException
     extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Plugin/FirePhp.php b/library/Zend/Wildfire/Plugin/FirePhp.php
index 9973b2ce67c..f80a23f3fc1 100644
--- a/library/Zend/Wildfire/Plugin/FirePhp.php
+++ b/library/Zend/Wildfire/Plugin/FirePhp.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FirePhp implements Wildfire\Plugin
 {
diff --git a/library/Zend/Wildfire/Plugin/FirePhp/Message.php b/library/Zend/Wildfire/Plugin/FirePhp/Message.php
index 18a52c4b40b..64fff08cb11 100644
--- a/library/Zend/Wildfire/Plugin/FirePhp/Message.php
+++ b/library/Zend/Wildfire/Plugin/FirePhp/Message.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin\FirePhp;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Message
 {
diff --git a/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php b/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php
index 2737d1e5a90..a78a4c99e7b 100644
--- a/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php
+++ b/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Plugin\FirePhp;
@@ -32,8 +30,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class TableMessage extends Message
 {
diff --git a/library/Zend/Wildfire/Protocol/Exception/ExceptionInterface.php b/library/Zend/Wildfire/Protocol/Exception/ExceptionInterface.php
index 31b09dd3ab3..a1d054fddf7 100644
--- a/library/Zend/Wildfire/Protocol/Exception/ExceptionInterface.php
+++ b/library/Zend/Wildfire/Protocol/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Protocol\Exception;
@@ -25,8 +23,6 @@
 /**
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Protocol/Exception/InvalidArgumentException.php b/library/Zend/Wildfire/Protocol/Exception/InvalidArgumentException.php
index 5f080e876b9..90b0e21d4e4 100644
--- a/library/Zend/Wildfire/Protocol/Exception/InvalidArgumentException.php
+++ b/library/Zend/Wildfire/Protocol/Exception/InvalidArgumentException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Protocol\Exception;
@@ -27,10 +25,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Protocol/Exception/OutOfRangeException.php b/library/Zend/Wildfire/Protocol/Exception/OutOfRangeException.php
index eb2b814d93c..0596100bdb1 100644
--- a/library/Zend/Wildfire/Protocol/Exception/OutOfRangeException.php
+++ b/library/Zend/Wildfire/Protocol/Exception/OutOfRangeException.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Protocol\Exception;
@@ -27,10 +25,8 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class OutOfRangeException
     extends Exception\OutOfRangeException
     implements ExceptionInterface
-{}
\ No newline at end of file
+{}
diff --git a/library/Zend/Wildfire/Protocol/JsonStream.php b/library/Zend/Wildfire/Protocol/JsonStream.php
index 4c75c08f0c3..b0ef9cdaed1 100644
--- a/library/Zend/Wildfire/Protocol/JsonStream.php
+++ b/library/Zend/Wildfire/Protocol/JsonStream.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\Wildfire\Protocol;
@@ -30,8 +28,6 @@
  * @category   Zend
  * @package    Zend_Wildfire
  * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class JsonStream
 {
diff --git a/library/Zend/XmlRpc/AbstractValue.php b/library/Zend/XmlRpc/AbstractValue.php
index 0d622af45e8..45d35afd2e4 100644
--- a/library/Zend/XmlRpc/AbstractValue.php
+++ b/library/Zend/XmlRpc/AbstractValue.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc;
@@ -35,8 +33,6 @@
  * from PHP variables, XML string or by specifing the exact XML-RPC natvie type
  *
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractValue
 {
diff --git a/library/Zend/XmlRpc/Client.php b/library/Zend/XmlRpc/Client.php
index 48d6569b932..93081d5f010 100644
--- a/library/Zend/XmlRpc/Client.php
+++ b/library/Zend/XmlRpc/Client.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Client implements ServerClient
 {
diff --git a/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php b/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
index bbeac534b73..0bf68992e28 100644
--- a/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
+++ b/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Client\Exception;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/XmlRpc/Client/Exception/FaultException.php b/library/Zend/XmlRpc/Client/Exception/FaultException.php
index ae2c75c3984..d03950072f3 100644
--- a/library/Zend/XmlRpc/Client/Exception/FaultException.php
+++ b/library/Zend/XmlRpc/Client/Exception/FaultException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Client\Exception;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FaultException extends Exception\BadMethodCallException implements ExceptionInterface
 {
diff --git a/library/Zend/XmlRpc/Client/Exception/HttpException.php b/library/Zend/XmlRpc/Client/Exception/HttpException.php
index b5a5148bb1a..eda75fa74be 100644
--- a/library/Zend/XmlRpc/Client/Exception/HttpException.php
+++ b/library/Zend/XmlRpc/Client/Exception/HttpException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Client\Exception;
@@ -28,8 +26,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class HttpException extends RuntimeException
 {
diff --git a/library/Zend/XmlRpc/Client/Exception/IntrospectException.php b/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
index a3f73365257..b9a254f3889 100644
--- a/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
+++ b/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Client\Exception;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IntrospectException extends InvalidArgumentException
 {
diff --git a/library/Zend/XmlRpc/Client/ServerIntrospection.php b/library/Zend/XmlRpc/Client/ServerIntrospection.php
index 7207fad5b9c..4cd8030c072 100644
--- a/library/Zend/XmlRpc/Client/ServerIntrospection.php
+++ b/library/Zend/XmlRpc/Client/ServerIntrospection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Client;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServerIntrospection
 {
diff --git a/library/Zend/XmlRpc/Client/ServerProxy.php b/library/Zend/XmlRpc/Client/ServerProxy.php
index bd0cd3e3381..f4e5b8b7dcc 100644
--- a/library/Zend/XmlRpc/Client/ServerProxy.php
+++ b/library/Zend/XmlRpc/Client/ServerProxy.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Client;
@@ -31,8 +29,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ServerProxy
 {
diff --git a/library/Zend/XmlRpc/Exception/ExceptionInterface.php b/library/Zend/XmlRpc/Exception/ExceptionInterface.php
index 4975deb55c5..2fc8feffdd7 100644
--- a/library/Zend/XmlRpc/Exception/ExceptionInterface.php
+++ b/library/Zend/XmlRpc/Exception/ExceptionInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Exception;
@@ -23,8 +21,6 @@
 /**
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
 {
diff --git a/library/Zend/XmlRpc/Exception/ValueException.php b/library/Zend/XmlRpc/Exception/ValueException.php
index cc514aaaecf..2a31560bfe7 100644
--- a/library/Zend/XmlRpc/Exception/ValueException.php
+++ b/library/Zend/XmlRpc/Exception/ValueException.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Exception;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ValueException extends \LogicException implements ExceptionInterface
 {
diff --git a/library/Zend/XmlRpc/Fault.php b/library/Zend/XmlRpc/Fault.php
index f9c8812fe24..589976d947b 100644
--- a/library/Zend/XmlRpc/Fault.php
+++ b/library/Zend/XmlRpc/Fault.php
@@ -14,8 +14,6 @@
  *
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Fault
 {
diff --git a/library/Zend/XmlRpc/Generator/AbstractGenerator.php b/library/Zend/XmlRpc/Generator/AbstractGenerator.php
index 5150dcd4280..d2c1b9adc02 100644
--- a/library/Zend/XmlRpc/Generator/AbstractGenerator.php
+++ b/library/Zend/XmlRpc/Generator/AbstractGenerator.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Generator;
diff --git a/library/Zend/XmlRpc/Generator/DomDocument.php b/library/Zend/XmlRpc/Generator/DomDocument.php
index 5bdbb8ee162..d8cc4a8af84 100644
--- a/library/Zend/XmlRpc/Generator/DomDocument.php
+++ b/library/Zend/XmlRpc/Generator/DomDocument.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Generator;
@@ -27,7 +25,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  */
 class DomDocument extends AbstractGenerator
 {
diff --git a/library/Zend/XmlRpc/Generator/GeneratorInterface.php b/library/Zend/XmlRpc/Generator/GeneratorInterface.php
index a306ad6bd64..e7100d870ff 100644
--- a/library/Zend/XmlRpc/Generator/GeneratorInterface.php
+++ b/library/Zend/XmlRpc/Generator/GeneratorInterface.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Generator;
diff --git a/library/Zend/XmlRpc/Generator/XmlWriter.php b/library/Zend/XmlRpc/Generator/XmlWriter.php
index b28374fff6a..fa391408bf5 100644
--- a/library/Zend/XmlRpc/Generator/XmlWriter.php
+++ b/library/Zend/XmlRpc/Generator/XmlWriter.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Generator;
diff --git a/library/Zend/XmlRpc/Request.php b/library/Zend/XmlRpc/Request.php
index 3faddcd915c..7f028d90d39 100644
--- a/library/Zend/XmlRpc/Request.php
+++ b/library/Zend/XmlRpc/Request.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc;
@@ -33,8 +31,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Request
 {
diff --git a/library/Zend/XmlRpc/Request/Http.php b/library/Zend/XmlRpc/Request/Http.php
index a7ffc772c3b..7835ada8bc9 100644
--- a/library/Zend/XmlRpc/Request/Http.php
+++ b/library/Zend/XmlRpc/Request/Http.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Request;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Http extends XmlRpcRequest
 {
diff --git a/library/Zend/XmlRpc/Request/Stdin.php b/library/Zend/XmlRpc/Request/Stdin.php
index eda4d1169e5..4302b696be0 100644
--- a/library/Zend/XmlRpc/Request/Stdin.php
+++ b/library/Zend/XmlRpc/Request/Stdin.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Request;
@@ -32,8 +30,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Stdin extends XmlRpcRequest
 {
diff --git a/library/Zend/XmlRpc/Response.php b/library/Zend/XmlRpc/Response.php
index ea35a88a2a0..7e0b765995b 100644
--- a/library/Zend/XmlRpc/Response.php
+++ b/library/Zend/XmlRpc/Response.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Response
 {
diff --git a/library/Zend/XmlRpc/Response/Http.php b/library/Zend/XmlRpc/Response/Http.php
index 895a0b06d1f..1fd6b20de29 100644
--- a/library/Zend/XmlRpc/Response/Http.php
+++ b/library/Zend/XmlRpc/Response/Http.php
@@ -14,8 +14,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Response;
@@ -27,8 +25,6 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Http extends XmlRpcResponse
 {
diff --git a/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php
index 742c9d83479..ccabba878f8 100644
--- a/library/Zend/XmlRpc/Server.php
+++ b/library/Zend/XmlRpc/Server.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc;
@@ -60,8 +58,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Server extends AbstractServer
 {
diff --git a/library/Zend/XmlRpc/Server/Cache.php b/library/Zend/XmlRpc/Server/Cache.php
index fc443c24e4d..8fe22becc69 100644
--- a/library/Zend/XmlRpc/Server/Cache.php
+++ b/library/Zend/XmlRpc/Server/Cache.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Server;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Cache extends \Zend\Server\Cache
 {
diff --git a/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php b/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
index 98eede9310f..6e962d40e8a 100644
--- a/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
+++ b/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Server\Exception;
@@ -29,8 +27,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/library/Zend/XmlRpc/Server/Fault.php b/library/Zend/XmlRpc/Server/Fault.php
index c8029facadf..a5dc3027c58 100644
--- a/library/Zend/XmlRpc/Server/Fault.php
+++ b/library/Zend/XmlRpc/Server/Fault.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Server;
@@ -39,8 +37,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Fault extends \Zend\XmlRpc\Fault
 {
diff --git a/library/Zend/XmlRpc/Server/System.php b/library/Zend/XmlRpc/Server/System.php
index 635a859cbd9..be0f0767b88 100644
--- a/library/Zend/XmlRpc/Server/System.php
+++ b/library/Zend/XmlRpc/Server/System.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Server;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class System
 {
diff --git a/library/Zend/XmlRpc/Value/AbstractCollection.php b/library/Zend/XmlRpc/Value/AbstractCollection.php
index c2c04a74ab7..f0ddf496240 100644
--- a/library/Zend/XmlRpc/Value/AbstractCollection.php
+++ b/library/Zend/XmlRpc/Value/AbstractCollection.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractCollection extends AbstractValue
 {
diff --git a/library/Zend/XmlRpc/Value/AbstractScalar.php b/library/Zend/XmlRpc/Value/AbstractScalar.php
index 8e5fa4dda60..14c64896c68 100644
--- a/library/Zend/XmlRpc/Value/AbstractScalar.php
+++ b/library/Zend/XmlRpc/Value/AbstractScalar.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractScalar extends AbstractValue
 {
diff --git a/library/Zend/XmlRpc/Value/ArrayValue.php b/library/Zend/XmlRpc/Value/ArrayValue.php
index b33517c9e07..20ed01c0fae 100644
--- a/library/Zend/XmlRpc/Value/ArrayValue.php
+++ b/library/Zend/XmlRpc/Value/ArrayValue.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayValue extends AbstractCollection
 {
diff --git a/library/Zend/XmlRpc/Value/Base64.php b/library/Zend/XmlRpc/Value/Base64.php
index 564d8516007..b64a0ce618f 100644
--- a/library/Zend/XmlRpc/Value/Base64.php
+++ b/library/Zend/XmlRpc/Value/Base64.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Base64 extends AbstractScalar
 {
diff --git a/library/Zend/XmlRpc/Value/BigInteger.php b/library/Zend/XmlRpc/Value/BigInteger.php
index 50abfdd4d07..67060f2a2f4 100644
--- a/library/Zend/XmlRpc/Value/BigInteger.php
+++ b/library/Zend/XmlRpc/Value/BigInteger.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -27,8 +25,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class BigInteger extends Integer
 {
diff --git a/library/Zend/XmlRpc/Value/Boolean.php b/library/Zend/XmlRpc/Value/Boolean.php
index a648d1f0ec4..20c9900475f 100644
--- a/library/Zend/XmlRpc/Value/Boolean.php
+++ b/library/Zend/XmlRpc/Value/Boolean.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Boolean extends AbstractScalar
 {
diff --git a/library/Zend/XmlRpc/Value/DateTime.php b/library/Zend/XmlRpc/Value/DateTime.php
index 8c501a50cb2..d0b2aa81b25 100644
--- a/library/Zend/XmlRpc/Value/DateTime.php
+++ b/library/Zend/XmlRpc/Value/DateTime.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DateTime extends AbstractScalar
 {
diff --git a/library/Zend/XmlRpc/Value/Double.php b/library/Zend/XmlRpc/Value/Double.php
index 0094728b47e..3803fca1018 100644
--- a/library/Zend/XmlRpc/Value/Double.php
+++ b/library/Zend/XmlRpc/Value/Double.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Double extends AbstractScalar
 {
diff --git a/library/Zend/XmlRpc/Value/Integer.php b/library/Zend/XmlRpc/Value/Integer.php
index 2a81d159ac1..2610badd67c 100644
--- a/library/Zend/XmlRpc/Value/Integer.php
+++ b/library/Zend/XmlRpc/Value/Integer.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -26,8 +24,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Integer extends AbstractScalar
 {
diff --git a/library/Zend/XmlRpc/Value/Nil.php b/library/Zend/XmlRpc/Value/Nil.php
index b8d6f4ebf2e..053a17bc29e 100644
--- a/library/Zend/XmlRpc/Value/Nil.php
+++ b/library/Zend/XmlRpc/Value/Nil.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Nil extends AbstractScalar
 {
diff --git a/library/Zend/XmlRpc/Value/String.php b/library/Zend/XmlRpc/Value/String.php
index 1fe5c5256c5..6f6b7c4f344 100644
--- a/library/Zend/XmlRpc/Value/String.php
+++ b/library/Zend/XmlRpc/Value/String.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -24,8 +22,6 @@
 /**
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class String extends AbstractScalar
 {
diff --git a/library/Zend/XmlRpc/Value/Struct.php b/library/Zend/XmlRpc/Value/Struct.php
index 3b4e9ad4e8b..5d8808e91f3 100644
--- a/library/Zend/XmlRpc/Value/Struct.php
+++ b/library/Zend/XmlRpc/Value/Struct.php
@@ -15,8 +15,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 namespace Zend\XmlRpc\Value;
@@ -25,8 +23,6 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Struct extends AbstractCollection
 {