From 40961258de48e04f83b5b462a33331bdac2c3c40 Mon Sep 17 00:00:00 2001
From: Shawn Stratton <sstratton@php.net>
Date: Sat, 4 Sep 2010 18:38:34 -0400
Subject: [PATCH 1/2] Cleaned up merge from branch 'farazdagi'

---
 src/Reader/Extension/Syndication/Feed.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php
index d877a801..af7e3aba 100644
--- a/src/Reader/Extension/Syndication/Feed.php
+++ b/src/Reader/Extension/Syndication/Feed.php
@@ -28,16 +28,6 @@
 use Zend\Date;
 
 /**
-<<<<<<< HEAD
-* @uses \Zend\Feed\Reader\Reader
-* @uses \Zend\Feed\Reader\Extension\EntryAbstract
-* @category Zend
-* @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
-*/
-class Feed extends Extension\AbstractFeed
-=======
  * @uses       \Zend\Date\Date
  * @uses       \Zend\Feed\Reader\Extension\AbstractFeed
  * @category   Zend
@@ -46,7 +36,6 @@ class Feed extends Extension\AbstractFeed
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
->>>>>>> master
 {
     /**
      * Get update period

From 60debf28d618fef4da6c5ed7815abe8152dcf54a Mon Sep 17 00:00:00 2001
From: Ben Scholzen <mail@dasprids.de>
Date: Fri, 17 Sep 2010 19:34:14 +0200
Subject: [PATCH 2/2] Removed SVN keywords from all files

---
 src/Exception.php                                     | 1 -
 src/PubSubHubbub/AbstractCallback.php                 | 1 -
 src/PubSubHubbub/Callback.php                         | 1 -
 src/PubSubHubbub/Exception.php                        | 1 -
 src/PubSubHubbub/HttpResponse.php                     | 1 -
 src/PubSubHubbub/Model/AbstractModel.php              | 1 -
 src/PubSubHubbub/Model/Subscription.php               | 1 -
 src/PubSubHubbub/Model/SubscriptionPersistence.php    | 1 -
 src/PubSubHubbub/PubSubHubbub.php                     | 1 -
 src/PubSubHubbub/Publisher.php                        | 1 -
 src/PubSubHubbub/Subscriber.php                       | 1 -
 src/PubSubHubbub/Subscriber/Callback.php              | 1 -
 src/Reader/AbstractEntry.php                          | 1 -
 src/Reader/AbstractFeed.php                           | 1 -
 src/Reader/Collection.php                             | 1 -
 src/Reader/Collection/AbstractCollection.php          | 1 -
 src/Reader/Collection/Author.php                      | 1 -
 src/Reader/Collection/Category.php                    | 1 -
 src/Reader/Collection/Collection.php                  | 1 -
 src/Reader/Entry.php                                  | 1 -
 src/Reader/Entry/AbstractEntry.php                    | 1 -
 src/Reader/Entry/Atom.php                             | 1 -
 src/Reader/Entry/Rss.php                              | 1 -
 src/Reader/Exception.php                              | 1 -
 src/Reader/Extension/AbstractEntry.php                | 1 -
 src/Reader/Extension/AbstractFeed.php                 | 1 -
 src/Reader/Extension/Atom/Entry.php                   | 1 -
 src/Reader/Extension/Atom/Feed.php                    | 1 -
 src/Reader/Extension/Content/Entry.php                | 1 -
 src/Reader/Extension/CreativeCommons/Entry.php        | 1 -
 src/Reader/Extension/CreativeCommons/Feed.php         | 1 -
 src/Reader/Extension/DublinCore/Entry.php             | 1 -
 src/Reader/Extension/DublinCore/Feed.php              | 1 -
 src/Reader/Extension/Podcast/Entry.php                | 1 -
 src/Reader/Extension/Podcast/Feed.php                 | 1 -
 src/Reader/Extension/Slash/Entry.php                  | 1 -
 src/Reader/Extension/Syndication/Feed.php             | 1 -
 src/Reader/Extension/Thread/Entry.php                 | 1 -
 src/Reader/Extension/WellFormedWeb/Entry.php          | 1 -
 src/Reader/Feed.php                                   | 1 -
 src/Reader/Feed/AbstractFeed.php                      | 1 -
 src/Reader/Feed/Atom.php                              | 1 -
 src/Reader/Feed/Atom/Source.php                       | 1 -
 src/Reader/Feed/Rss.php                               | 1 -
 src/Reader/FeedSet.php                                | 1 -
 src/Reader/Reader.php                                 | 1 -
 src/Writer/AbstractFeed.php                           | 1 -
 src/Writer/Deleted.php                                | 1 -
 src/Writer/Entry.php                                  | 1 -
 src/Writer/Exception.php                              | 1 -
 src/Writer/Exception/InvalidMethodException.php       | 1 -
 src/Writer/Extension/AbstractRenderer.php             | 1 -
 src/Writer/Extension/Atom/Renderer/Feed.php           | 1 -
 src/Writer/Extension/Content/Renderer/Entry.php       | 1 -
 src/Writer/Extension/DublinCore/Renderer/Entry.php    | 1 -
 src/Writer/Extension/DublinCore/Renderer/Feed.php     | 1 -
 src/Writer/Extension/ITunes/Entry.php                 | 1 -
 src/Writer/Extension/ITunes/Feed.php                  | 1 -
 src/Writer/Extension/ITunes/Renderer/Entry.php        | 1 -
 src/Writer/Extension/ITunes/Renderer/Feed.php         | 1 -
 src/Writer/Extension/Renderer.php                     | 1 -
 src/Writer/Extension/Slash/Renderer/Entry.php         | 1 -
 src/Writer/Extension/Threading/Renderer/Entry.php     | 1 -
 src/Writer/Extension/WellFormedWeb/Renderer/Entry.php | 1 -
 src/Writer/Feed.php                                   | 1 -
 src/Writer/InvalidMethodException.php                 | 1 -
 src/Writer/Renderer.php                               | 1 -
 src/Writer/Renderer/AbstractRenderer.php              | 1 -
 src/Writer/Renderer/Entry/Atom.php                    | 1 -
 src/Writer/Renderer/Entry/Atom/Deleted.php            | 1 -
 src/Writer/Renderer/Entry/AtomDeleted.php             | 1 -
 src/Writer/Renderer/Entry/Rss.php                     | 1 -
 src/Writer/Renderer/Feed/AbstractAtom.php             | 1 -
 src/Writer/Renderer/Feed/Atom.php                     | 1 -
 src/Writer/Renderer/Feed/Atom/AbstractAtom.php        | 1 -
 src/Writer/Renderer/Feed/Atom/Source.php              | 1 -
 src/Writer/Renderer/Feed/AtomSource.php               | 1 -
 src/Writer/Renderer/Feed/Rss.php                      | 1 -
 src/Writer/Renderer/Renderer.php                      | 1 -
 src/Writer/Source.php                                 | 1 -
 src/Writer/Writer.php                                 | 1 -
 test/PubSubHubbub/Model/SubscriptionTest.php          | 1 -
 test/PubSubHubbub/PubSubHubbubTest.php                | 1 -
 test/PubSubHubbub/PublisherTest.php                   | 1 -
 test/PubSubHubbub/Subscriber/CallbackTest.php         | 1 -
 test/PubSubHubbub/SubscriberHttpTest.php              | 1 -
 test/PubSubHubbub/SubscriberTest.php                  | 1 -
 test/Reader/Entry/AtomStandaloneEntryTest.php         | 1 -
 test/Reader/Entry/AtomTest.php                        | 1 -
 test/Reader/Entry/CommonTest.php                      | 1 -
 test/Reader/Entry/RssTest.php                         | 1 -
 test/Reader/Feed/AtomSourceTest.php                   | 1 -
 test/Reader/Feed/AtomTest.php                         | 1 -
 test/Reader/Feed/CommonTest.php                       | 1 -
 test/Reader/Feed/RssTest.php                          | 1 -
 test/Reader/Integration/H-OnlineComAtom10Test.php     | 1 -
 test/Reader/Integration/LautDeRdfTest.php             | 1 -
 test/Reader/Integration/PodcastRss2Test.php           | 1 -
 test/Reader/Integration/WordpressAtom10Test.php       | 1 -
 test/Reader/Integration/WordpressRss2DcAtomTest.php   | 1 -
 test/Reader/ReaderTest.php                            | 1 -
 test/Reader/_files/My/Extension/JungleBooks/Entry.php | 1 -
 test/Reader/_files/My/Extension/JungleBooks/Feed.php  | 1 -
 test/ReaderTest.php                                   | 1 -
 test/Writer/DeletedTest.php                           | 1 -
 test/Writer/EntryTest.php                             | 1 -
 test/Writer/Extension/ITunes/EntryTest.php            | 1 -
 test/Writer/Extension/ITunes/FeedTest.php             | 1 -
 test/Writer/FeedTest.php                              | 1 -
 test/Writer/Renderer/Entry/AtomTest.php               | 1 -
 test/Writer/Renderer/Entry/RssTest.php                | 1 -
 test/Writer/Renderer/Feed/AtomTest.php                | 1 -
 test/Writer/Renderer/Feed/RssTest.php                 | 1 -
 113 files changed, 113 deletions(-)

diff --git a/src/Exception.php b/src/Exception.php
index 4bfa9ec1..bdc0f3d7 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/AbstractCallback.php b/src/PubSubHubbub/AbstractCallback.php
index ad531030..f5b8c32a 100644
--- a/src/PubSubHubbub/AbstractCallback.php
+++ b/src/PubSubHubbub/AbstractCallback.php
@@ -17,7 +17,6 @@
  * @subpackage Callback
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Callback.php b/src/PubSubHubbub/Callback.php
index d1402ec1..54f18c76 100644
--- a/src/PubSubHubbub/Callback.php
+++ b/src/PubSubHubbub/Callback.php
@@ -17,7 +17,6 @@
  * @subpackage Callback
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Exception.php b/src/PubSubHubbub/Exception.php
index 22dfc283..04155c21 100644
--- a/src/PubSubHubbub/Exception.php
+++ b/src/PubSubHubbub/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/HttpResponse.php b/src/PubSubHubbub/HttpResponse.php
index afceeed0..7c705171 100644
--- a/src/PubSubHubbub/HttpResponse.php
+++ b/src/PubSubHubbub/HttpResponse.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Model/AbstractModel.php b/src/PubSubHubbub/Model/AbstractModel.php
index 704deb75..f6b4b2d4 100644
--- a/src/PubSubHubbub/Model/AbstractModel.php
+++ b/src/PubSubHubbub/Model/AbstractModel.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Model/Subscription.php b/src/PubSubHubbub/Model/Subscription.php
index 58f4a367..23a162e8 100644
--- a/src/PubSubHubbub/Model/Subscription.php
+++ b/src/PubSubHubbub/Model/Subscription.php
@@ -17,7 +17,6 @@
  * @subpackage Entity
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Model/SubscriptionPersistence.php b/src/PubSubHubbub/Model/SubscriptionPersistence.php
index 4d450c0f..ea7f49f8 100644
--- a/src/PubSubHubbub/Model/SubscriptionPersistence.php
+++ b/src/PubSubHubbub/Model/SubscriptionPersistence.php
@@ -17,7 +17,6 @@
  * @subpackage Entity
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/PubSubHubbub.php b/src/PubSubHubbub/PubSubHubbub.php
index 83876062..d471b323 100644
--- a/src/PubSubHubbub/PubSubHubbub.php
+++ b/src/PubSubHubbub/PubSubHubbub.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Publisher.php b/src/PubSubHubbub/Publisher.php
index c69a3f8d..7d76d4ec 100644
--- a/src/PubSubHubbub/Publisher.php
+++ b/src/PubSubHubbub/Publisher.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Subscriber.php b/src/PubSubHubbub/Subscriber.php
index 47c485b3..cd6a3ffa 100644
--- a/src/PubSubHubbub/Subscriber.php
+++ b/src/PubSubHubbub/Subscriber.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/PubSubHubbub/Subscriber/Callback.php b/src/PubSubHubbub/Subscriber/Callback.php
index c578f63d..c583f157 100644
--- a/src/PubSubHubbub/Subscriber/Callback.php
+++ b/src/PubSubHubbub/Subscriber/Callback.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Reader/AbstractEntry.php b/src/Reader/AbstractEntry.php
index efbec614..056d815d 100644
--- a/src/Reader/AbstractEntry.php
+++ b/src/Reader/AbstractEntry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Reader/AbstractFeed.php b/src/Reader/AbstractFeed.php
index 4eac6499..0fa81309 100644
--- a/src/Reader/AbstractFeed.php
+++ b/src/Reader/AbstractFeed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Reader/Collection.php b/src/Reader/Collection.php
index 101b12cd..8cfe5d9a 100644
--- a/src/Reader/Collection.php
+++ b/src/Reader/Collection.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Reader/Collection/AbstractCollection.php b/src/Reader/Collection/AbstractCollection.php
index 0e1886a2..947ab620 100644
--- a/src/Reader/Collection/AbstractCollection.php
+++ b/src/Reader/Collection/AbstractCollection.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CollectionAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
  
 /**
diff --git a/src/Reader/Collection/Author.php b/src/Reader/Collection/Author.php
index 979349bb..1bb45f38 100644
--- a/src/Reader/Collection/Author.php
+++ b/src/Reader/Collection/Author.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
  
 /**
diff --git a/src/Reader/Collection/Category.php b/src/Reader/Collection/Category.php
index fd172c03..a96af3ae 100644
--- a/src/Reader/Collection/Category.php
+++ b/src/Reader/Collection/Category.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Category.php 20953 2010-02-06 17:55:34Z padraic $
  */
  
 /**
diff --git a/src/Reader/Collection/Collection.php b/src/Reader/Collection/Collection.php
index 7d024aed..6d852d84 100644
--- a/src/Reader/Collection/Collection.php
+++ b/src/Reader/Collection/Collection.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Collection.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
 
 /**
diff --git a/src/Reader/Entry.php b/src/Reader/Entry.php
index 753db670..22a8a5c7 100644
--- a/src/Reader/Entry.php
+++ b/src/Reader/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EntryInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php
index fb950743..4af35644 100644
--- a/src/Reader/Entry/AbstractEntry.php
+++ b/src/Reader/Entry/AbstractEntry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EntryAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
  
 /**
diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php
index 9169f14d..99a48ffe 100644
--- a/src/Reader/Entry/Atom.php
+++ b/src/Reader/Entry/Atom.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
index fe2f36a7..f6341b1c 100644
--- a/src/Reader/Entry/Rss.php
+++ b/src/Reader/Entry/Rss.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 22300 2010-05-26 10:13:34Z padraic $
  */
 
 /**
diff --git a/src/Reader/Exception.php b/src/Reader/Exception.php
index 64e36a14..10fe80c5 100644
--- a/src/Reader/Exception.php
+++ b/src/Reader/Exception.php
@@ -16,7 +16,6 @@
 * @package Zend_Feed
 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
 * @license http://framework.zend.com/license/new-bsd New BSD License
-* @version $Id$
 */
 
 /**
diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php
index 56562bb6..e963be67 100644
--- a/src/Reader/Extension/AbstractEntry.php
+++ b/src/Reader/Extension/AbstractEntry.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EntryAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/AbstractFeed.php b/src/Reader/Extension/AbstractFeed.php
index 9a50b72f..16655c5c 100644
--- a/src/Reader/Extension/AbstractFeed.php
+++ b/src/Reader/Extension/AbstractFeed.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
index f6b0d6f5..f0fe869c 100644
--- a/src/Reader/Extension/Atom/Entry.php
+++ b/src/Reader/Extension/Atom/Entry.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 22300 2010-05-26 10:13:34Z padraic $
  */
 
 /**
diff --git a/src/Reader/Extension/Atom/Feed.php b/src/Reader/Extension/Atom/Feed.php
index 5d9cd68e..2356d32c 100644
--- a/src/Reader/Extension/Atom/Feed.php
+++ b/src/Reader/Extension/Atom/Feed.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 22300 2010-05-26 10:13:34Z padraic $
  */
 
 /**
diff --git a/src/Reader/Extension/Content/Entry.php b/src/Reader/Extension/Content/Entry.php
index f3f8b66a..980a12cb 100644
--- a/src/Reader/Extension/Content/Entry.php
+++ b/src/Reader/Extension/Content/Entry.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 22300 2010-05-26 10:13:34Z padraic $
  */
 
 /**
diff --git a/src/Reader/Extension/CreativeCommons/Entry.php b/src/Reader/Extension/CreativeCommons/Entry.php
index 2de8f55a..e9e30caf 100644
--- a/src/Reader/Extension/CreativeCommons/Entry.php
+++ b/src/Reader/Extension/CreativeCommons/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/CreativeCommons/Feed.php b/src/Reader/Extension/CreativeCommons/Feed.php
index 82dbd185..1a8b7488 100644
--- a/src/Reader/Extension/CreativeCommons/Feed.php
+++ b/src/Reader/Extension/CreativeCommons/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/DublinCore/Entry.php b/src/Reader/Extension/DublinCore/Entry.php
index 923996e0..d530e7c3 100644
--- a/src/Reader/Extension/DublinCore/Entry.php
+++ b/src/Reader/Extension/DublinCore/Entry.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/DublinCore/Feed.php b/src/Reader/Extension/DublinCore/Feed.php
index 4a80b40a..33a3737a 100644
--- a/src/Reader/Extension/DublinCore/Feed.php
+++ b/src/Reader/Extension/DublinCore/Feed.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/Podcast/Entry.php b/src/Reader/Extension/Podcast/Entry.php
index 3636469f..7ceefbbc 100644
--- a/src/Reader/Extension/Podcast/Entry.php
+++ b/src/Reader/Extension/Podcast/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/Podcast/Feed.php b/src/Reader/Extension/Podcast/Feed.php
index 292e8f71..325b44d7 100644
--- a/src/Reader/Extension/Podcast/Feed.php
+++ b/src/Reader/Extension/Podcast/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/Slash/Entry.php b/src/Reader/Extension/Slash/Entry.php
index 43bf1184..032d3da8 100644
--- a/src/Reader/Extension/Slash/Entry.php
+++ b/src/Reader/Extension/Slash/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php
index af7e3aba..ea1970b2 100644
--- a/src/Reader/Extension/Syndication/Feed.php
+++ b/src/Reader/Extension/Syndication/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/Thread/Entry.php b/src/Reader/Extension/Thread/Entry.php
index e81573cf..d0a53bab 100644
--- a/src/Reader/Extension/Thread/Entry.php
+++ b/src/Reader/Extension/Thread/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Extension/WellFormedWeb/Entry.php b/src/Reader/Extension/WellFormedWeb/Entry.php
index 1bfe9d35..41b3813a 100644
--- a/src/Reader/Extension/WellFormedWeb/Entry.php
+++ b/src/Reader/Extension/WellFormedWeb/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Feed.php b/src/Reader/Feed.php
index 46cc3b3a..ba0f91fe 100644
--- a/src/Reader/Feed.php
+++ b/src/Reader/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index b5ea3c79..cf0fc8d4 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedAbstract.php 22092 2010-05-04 12:50:51Z padraic $
  */
  
 /**
diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
index b4dcb4a4..5a12ea59 100644
--- a/src/Reader/Feed/Atom.php
+++ b/src/Reader/Feed/Atom.php
@@ -16,7 +16,6 @@
  * @package    Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 22107 2010-05-05 13:42:20Z padraic $
  */
 
 /**
diff --git a/src/Reader/Feed/Atom/Source.php b/src/Reader/Feed/Atom/Source.php
index 25c8cd31..cfd33d19 100644
--- a/src/Reader/Feed/Atom/Source.php
+++ b/src/Reader/Feed/Atom/Source.php
@@ -16,7 +16,6 @@
  * @package    Reader\Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Source.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
 
 /**
diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
index 410409f3..09ea262a 100644
--- a/src/Reader/Feed/Rss.php
+++ b/src/Reader/Feed/Rss.php
@@ -16,7 +16,6 @@
  * @package    Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 22300 2010-05-26 10:13:34Z padraic $
  */
 
 /**
diff --git a/src/Reader/FeedSet.php b/src/Reader/FeedSet.php
index 77def138..20b521da 100644
--- a/src/Reader/FeedSet.php
+++ b/src/Reader/FeedSet.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedSet.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 4982f27d..594ae517 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Reader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Reader.php 22092 2010-05-04 12:50:51Z padraic $
  */
 
 /**
diff --git a/src/Writer/AbstractFeed.php b/src/Writer/AbstractFeed.php
index c5c27f16..c6bbabef 100644
--- a/src/Writer/AbstractFeed.php
+++ b/src/Writer/AbstractFeed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedAbstract.php 22107 2010-05-05 13:42:20Z padraic $
  */
 
 /**
diff --git a/src/Writer/Deleted.php b/src/Writer/Deleted.php
index 83ebd929..094a7b27 100644
--- a/src/Writer/Deleted.php
+++ b/src/Writer/Deleted.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deleted.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
 
 /**
diff --git a/src/Writer/Entry.php b/src/Writer/Entry.php
index c16233fd..0502f185 100644
--- a/src/Writer/Entry.php
+++ b/src/Writer/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 22064 2010-04-30 14:02:38Z padraic $
  */
 
 /**
diff --git a/src/Writer/Exception.php b/src/Writer/Exception.php
index c9c2a8cc..babca267 100644
--- a/src/Writer/Exception.php
+++ b/src/Writer/Exception.php
@@ -16,7 +16,6 @@
 * @package Zend_Feed
 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
 * @license http://framework.zend.com/license/new-bsd New BSD License
-* @version $Id$
 */
 
 /**
diff --git a/src/Writer/Exception/InvalidMethodException.php b/src/Writer/Exception/InvalidMethodException.php
index c0a87573..715ddce9 100644
--- a/src/Writer/Exception/InvalidMethodException.php
+++ b/src/Writer/Exception/InvalidMethodException.php
@@ -17,7 +17,6 @@
  * @package    Zend_Feed
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InvalidMethodException.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /* @namespace */
diff --git a/src/Writer/Extension/AbstractRenderer.php b/src/Writer/Extension/AbstractRenderer.php
index c8d66102..808a84d7 100644
--- a/src/Writer/Extension/AbstractRenderer.php
+++ b/src/Writer/Extension/AbstractRenderer.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer_Entry_Rss
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
 
 /**
diff --git a/src/Writer/Extension/Atom/Renderer/Feed.php b/src/Writer/Extension/Atom/Renderer/Feed.php
index 12b2f2af..b5a985b7 100644
--- a/src/Writer/Extension/Atom/Renderer/Feed.php
+++ b/src/Writer/Extension/Atom/Renderer/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/Content/Renderer/Entry.php b/src/Writer/Extension/Content/Renderer/Entry.php
index 3f4567b2..cc07ba5e 100644
--- a/src/Writer/Extension/Content/Renderer/Entry.php
+++ b/src/Writer/Extension/Content/Renderer/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/DublinCore/Renderer/Entry.php b/src/Writer/Extension/DublinCore/Renderer/Entry.php
index 6fb40a51..9971c8cf 100644
--- a/src/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/src/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/DublinCore/Renderer/Feed.php b/src/Writer/Extension/DublinCore/Renderer/Feed.php
index 3ed1b8f5..016eb6eb 100644
--- a/src/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/src/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php
index 3dbb6eeb..82fdae0a 100644
--- a/src/Writer/Extension/ITunes/Entry.php
+++ b/src/Writer/Extension/ITunes/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
  
 /**
diff --git a/src/Writer/Extension/ITunes/Feed.php b/src/Writer/Extension/ITunes/Feed.php
index c7285ba9..969a666f 100644
--- a/src/Writer/Extension/ITunes/Feed.php
+++ b/src/Writer/Extension/ITunes/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
  
 /**
diff --git a/src/Writer/Extension/ITunes/Renderer/Entry.php b/src/Writer/Extension/ITunes/Renderer/Entry.php
index c446c8bc..24e1a2e4 100644
--- a/src/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/src/Writer/Extension/ITunes/Renderer/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/ITunes/Renderer/Feed.php b/src/Writer/Extension/ITunes/Renderer/Feed.php
index 88a55bd2..bcddd1da 100644
--- a/src/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/src/Writer/Extension/ITunes/Renderer/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/Renderer.php b/src/Writer/Extension/Renderer.php
index 26dc8e0e..ea32ecc1 100644
--- a/src/Writer/Extension/Renderer.php
+++ b/src/Writer/Extension/Renderer.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
 
 /**
diff --git a/src/Writer/Extension/Slash/Renderer/Entry.php b/src/Writer/Extension/Slash/Renderer/Entry.php
index 0cee8852..bfb08153 100644
--- a/src/Writer/Extension/Slash/Renderer/Entry.php
+++ b/src/Writer/Extension/Slash/Renderer/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/Threading/Renderer/Entry.php b/src/Writer/Extension/Threading/Renderer/Entry.php
index 8079a39a..1676b1f2 100644
--- a/src/Writer/Extension/Threading/Renderer/Entry.php
+++ b/src/Writer/Extension/Threading/Renderer/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index e3e0fb41..e3b93f48 100644
--- a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $
  */
  
 /**
diff --git a/src/Writer/Feed.php b/src/Writer/Feed.php
index caf58bcf..675a6023 100644
--- a/src/Writer/Feed.php
+++ b/src/Writer/Feed.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20518 2010-01-22 14:00:30Z padraic $
  */
 
 /**
diff --git a/src/Writer/InvalidMethodException.php b/src/Writer/InvalidMethodException.php
index 6475e484..4f963651 100644
--- a/src/Writer/InvalidMethodException.php
+++ b/src/Writer/InvalidMethodException.php
@@ -17,7 +17,6 @@
  * @package    Zend_Feed
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Writer/Renderer.php b/src/Writer/Renderer.php
index 9104bcfe..1e4b244c 100644
--- a/src/Writer/Renderer.php
+++ b/src/Writer/Renderer.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Writer/Renderer/AbstractRenderer.php b/src/Writer/Renderer/AbstractRenderer.php
index 1fc436ed..a1f4669a 100644
--- a/src/Writer/Renderer/AbstractRenderer.php
+++ b/src/Writer/Renderer/AbstractRenderer.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
  
 /**
diff --git a/src/Writer/Renderer/Entry/Atom.php b/src/Writer/Renderer/Entry/Atom.php
index 68d6f2f6..16ceea43 100644
--- a/src/Writer/Renderer/Entry/Atom.php
+++ b/src/Writer/Renderer/Entry/Atom.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 22064 2010-04-30 14:02:38Z padraic $
  */
 
 /**
diff --git a/src/Writer/Renderer/Entry/Atom/Deleted.php b/src/Writer/Renderer/Entry/Atom/Deleted.php
index 099d5eda..017d366d 100644
--- a/src/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/src/Writer/Renderer/Entry/Atom/Deleted.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Writer/Renderer/Entry/AtomDeleted.php b/src/Writer/Renderer/Entry/AtomDeleted.php
index 5bb1bd2f..e94b27db 100644
--- a/src/Writer/Renderer/Entry/AtomDeleted.php
+++ b/src/Writer/Renderer/Entry/AtomDeleted.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deleted.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
 
 /**
diff --git a/src/Writer/Renderer/Entry/Rss.php b/src/Writer/Renderer/Entry/Rss.php
index 8c2ef6ca..12699dca 100644
--- a/src/Writer/Renderer/Entry/Rss.php
+++ b/src/Writer/Renderer/Entry/Rss.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 22064 2010-04-30 14:02:38Z padraic $
  */
 
 /**
diff --git a/src/Writer/Renderer/Feed/AbstractAtom.php b/src/Writer/Renderer/Feed/AbstractAtom.php
index 832d9b04..430c258a 100644
--- a/src/Writer/Renderer/Feed/AbstractAtom.php
+++ b/src/Writer/Renderer/Feed/AbstractAtom.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AtomAbstract.php 22099 2010-05-04 18:51:58Z padraic $
  */
 
 /**
diff --git a/src/Writer/Renderer/Feed/Atom.php b/src/Writer/Renderer/Feed/Atom.php
index 2e6f7867..b9c7a4ad 100644
--- a/src/Writer/Renderer/Feed/Atom.php
+++ b/src/Writer/Renderer/Feed/Atom.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 22097 2010-05-04 17:56:06Z padraic $
  */
 
 /**
diff --git a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
index 129e5cdb..879c3b14 100644
--- a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Writer/Renderer/Feed/Atom/Source.php b/src/Writer/Renderer/Feed/Atom/Source.php
index df3b0685..7c4a1b02 100644
--- a/src/Writer/Renderer/Feed/Atom/Source.php
+++ b/src/Writer/Renderer/Feed/Atom/Source.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Writer/Renderer/Feed/AtomSource.php b/src/Writer/Renderer/Feed/AtomSource.php
index 763ed5a8..24b34e2d 100644
--- a/src/Writer/Renderer/Feed/AtomSource.php
+++ b/src/Writer/Renderer/Feed/AtomSource.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Source.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
  
 /**
diff --git a/src/Writer/Renderer/Feed/Rss.php b/src/Writer/Renderer/Feed/Rss.php
index 01375b9d..394e0903 100644
--- a/src/Writer/Renderer/Feed/Rss.php
+++ b/src/Writer/Renderer/Feed/Rss.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 22107 2010-05-05 13:42:20Z padraic $
  */
 
 /**
diff --git a/src/Writer/Renderer/Renderer.php b/src/Writer/Renderer/Renderer.php
index 85fd1fef..38c38184 100644
--- a/src/Writer/Renderer/Renderer.php
+++ b/src/Writer/Renderer/Renderer.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/src/Writer/Source.php b/src/Writer/Source.php
index a4eddf50..ba0be24d 100644
--- a/src/Writer/Source.php
+++ b/src/Writer/Source.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Source.php 20785 2010-01-31 09:43:03Z mikaelkael $
  */
 
 /**
diff --git a/src/Writer/Writer.php b/src/Writer/Writer.php
index 915e731a..560f91ea 100644
--- a/src/Writer/Writer.php
+++ b/src/Writer/Writer.php
@@ -16,7 +16,6 @@
  * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/PubSubHubbub/Model/SubscriptionTest.php b/test/PubSubHubbub/Model/SubscriptionTest.php
index 441dd5dd..1d361661 100644
--- a/test/PubSubHubbub/Model/SubscriptionTest.php
+++ b/test/PubSubHubbub/Model/SubscriptionTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Feed\PubSubHubbub\Model;
diff --git a/test/PubSubHubbub/PubSubHubbubTest.php b/test/PubSubHubbub/PubSubHubbubTest.php
index 3163e95c..399d73e9 100644
--- a/test/PubSubHubbub/PubSubHubbubTest.php
+++ b/test/PubSubHubbub/PubSubHubbubTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/PubSubHubbub/PublisherTest.php b/test/PubSubHubbub/PublisherTest.php
index 6b52f450..e08e0658 100644
--- a/test/PubSubHubbub/PublisherTest.php
+++ b/test/PubSubHubbub/PublisherTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/PubSubHubbub/Subscriber/CallbackTest.php b/test/PubSubHubbub/Subscriber/CallbackTest.php
index 5852da76..24883298 100644
--- a/test/PubSubHubbub/Subscriber/CallbackTest.php
+++ b/test/PubSubHubbub/Subscriber/CallbackTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/PubSubHubbub/SubscriberHttpTest.php b/test/PubSubHubbub/SubscriberHttpTest.php
index a792c2f6..9682f6d2 100644
--- a/test/PubSubHubbub/SubscriberHttpTest.php
+++ b/test/PubSubHubbub/SubscriberHttpTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/PubSubHubbub/SubscriberTest.php b/test/PubSubHubbub/SubscriberTest.php
index b476fc89..e01b9829 100644
--- a/test/PubSubHubbub/SubscriberTest.php
+++ b/test/PubSubHubbub/SubscriberTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Reader/Entry/AtomStandaloneEntryTest.php b/test/Reader/Entry/AtomStandaloneEntryTest.php
index 09dc5182..c083eebf 100644
--- a/test/Reader/Entry/AtomStandaloneEntryTest.php
+++ b/test/Reader/Entry/AtomStandaloneEntryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AtomTest.php 19159 2009-11-21 14:23:15Z padraic $
  */
 
 /**
diff --git a/test/Reader/Entry/AtomTest.php b/test/Reader/Entry/AtomTest.php
index 75dce94c..ae4606b1 100644
--- a/test/Reader/Entry/AtomTest.php
+++ b/test/Reader/Entry/AtomTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AtomTest.php 20462 2010-01-21 15:23:52Z padraic $
  */
 
 /**
diff --git a/test/Reader/Entry/CommonTest.php b/test/Reader/Entry/CommonTest.php
index 54e28162..4e9f6ce1 100644
--- a/test/Reader/Entry/CommonTest.php
+++ b/test/Reader/Entry/CommonTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommonTest.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/Reader/Entry/RssTest.php b/test/Reader/Entry/RssTest.php
index 7ef3bde7..c70798c0 100644
--- a/test/Reader/Entry/RssTest.php
+++ b/test/Reader/Entry/RssTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RssTest.php 22086 2010-05-04 11:25:54Z padraic $
  */
 
 /**
diff --git a/test/Reader/Feed/AtomSourceTest.php b/test/Reader/Feed/AtomSourceTest.php
index fc1f7057..f4c72c7f 100644
--- a/test/Reader/Feed/AtomSourceTest.php
+++ b/test/Reader/Feed/AtomSourceTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AtomTest.php 19168 2009-11-21 17:17:18Z padraic $
  */
 
 /**
diff --git a/test/Reader/Feed/AtomTest.php b/test/Reader/Feed/AtomTest.php
index 7dc793d2..ec482a5c 100644
--- a/test/Reader/Feed/AtomTest.php
+++ b/test/Reader/Feed/AtomTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AtomTest.php 22107 2010-05-05 13:42:20Z padraic $
  */
 
 /**
diff --git a/test/Reader/Feed/CommonTest.php b/test/Reader/Feed/CommonTest.php
index 3766824a..b2b2c116 100644
--- a/test/Reader/Feed/CommonTest.php
+++ b/test/Reader/Feed/CommonTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommonTest.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/Reader/Feed/RssTest.php b/test/Reader/Feed/RssTest.php
index d4992241..e1ec4dbb 100644
--- a/test/Reader/Feed/RssTest.php
+++ b/test/Reader/Feed/RssTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RssTest.php 22297 2010-05-25 21:33:38Z padraic $
  */
 
 /**
diff --git a/test/Reader/Integration/H-OnlineComAtom10Test.php b/test/Reader/Integration/H-OnlineComAtom10Test.php
index 572d19f5..2d8adf8d 100644
--- a/test/Reader/Integration/H-OnlineComAtom10Test.php
+++ b/test/Reader/Integration/H-OnlineComAtom10Test.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: H-OnlineComAtom10Test.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/Reader/Integration/LautDeRdfTest.php b/test/Reader/Integration/LautDeRdfTest.php
index 81d6b209..9d2dd4d8 100644
--- a/test/Reader/Integration/LautDeRdfTest.php
+++ b/test/Reader/Integration/LautDeRdfTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LautDeRdfTest.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/Reader/Integration/PodcastRss2Test.php b/test/Reader/Integration/PodcastRss2Test.php
index 429eda89..b66c6f6e 100644
--- a/test/Reader/Integration/PodcastRss2Test.php
+++ b/test/Reader/Integration/PodcastRss2Test.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PodcastRss2Test.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/Reader/Integration/WordpressAtom10Test.php b/test/Reader/Integration/WordpressAtom10Test.php
index 0a38add9..d491b8a9 100644
--- a/test/Reader/Integration/WordpressAtom10Test.php
+++ b/test/Reader/Integration/WordpressAtom10Test.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WordpressAtom10Test.php 22300 2010-05-26 10:13:34Z padraic $
  */
 
 /**
diff --git a/test/Reader/Integration/WordpressRss2DcAtomTest.php b/test/Reader/Integration/WordpressRss2DcAtomTest.php
index 5cfa5611..87e96609 100644
--- a/test/Reader/Integration/WordpressRss2DcAtomTest.php
+++ b/test/Reader/Integration/WordpressRss2DcAtomTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WordpressRss2DcAtomTest.php 22300 2010-05-26 10:13:34Z padraic $
  */
 
 /**
diff --git a/test/Reader/ReaderTest.php b/test/Reader/ReaderTest.php
index 53594843..4d4cff10 100644
--- a/test/Reader/ReaderTest.php
+++ b/test/Reader/ReaderTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ReaderTest.php 22031 2010-04-28 15:47:44Z padraic $
  */
 
 /**
diff --git a/test/Reader/_files/My/Extension/JungleBooks/Entry.php b/test/Reader/_files/My/Extension/JungleBooks/Entry.php
index dc195129..00025ffd 100644
--- a/test/Reader/_files/My/Extension/JungleBooks/Entry.php
+++ b/test/Reader/_files/My/Extension/JungleBooks/Entry.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/Reader/_files/My/Extension/JungleBooks/Feed.php b/test/Reader/_files/My/Extension/JungleBooks/Feed.php
index 72954472..030dbd64 100644
--- a/test/Reader/_files/My/Extension/JungleBooks/Feed.php
+++ b/test/Reader/_files/My/Extension/JungleBooks/Feed.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
diff --git a/test/ReaderTest.php b/test/ReaderTest.php
index 387b7281..218bb26c 100644
--- a/test/ReaderTest.php
+++ b/test/ReaderTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/DeletedTest.php b/test/Writer/DeletedTest.php
index b4ef079a..e522bd7e 100644
--- a/test/Writer/DeletedTest.php
+++ b/test/Writer/DeletedTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/EntryTest.php b/test/Writer/EntryTest.php
index a305f07b..464dbf60 100644
--- a/test/Writer/EntryTest.php
+++ b/test/Writer/EntryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/Extension/ITunes/EntryTest.php b/test/Writer/Extension/ITunes/EntryTest.php
index 2e169617..7e15070b 100644
--- a/test/Writer/Extension/ITunes/EntryTest.php
+++ b/test/Writer/Extension/ITunes/EntryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/Extension/ITunes/FeedTest.php b/test/Writer/Extension/ITunes/FeedTest.php
index 6d9a4b6f..2bc5b5d8 100644
--- a/test/Writer/Extension/ITunes/FeedTest.php
+++ b/test/Writer/Extension/ITunes/FeedTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/FeedTest.php b/test/Writer/FeedTest.php
index f356d1c9..4952a1b9 100644
--- a/test/Writer/FeedTest.php
+++ b/test/Writer/FeedTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/Renderer/Entry/AtomTest.php b/test/Writer/Renderer/Entry/AtomTest.php
index 18783c0d..59601058 100644
--- a/test/Writer/Renderer/Entry/AtomTest.php
+++ b/test/Writer/Renderer/Entry/AtomTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/Renderer/Entry/RssTest.php b/test/Writer/Renderer/Entry/RssTest.php
index 329288a9..f18ebeb7 100644
--- a/test/Writer/Renderer/Entry/RssTest.php
+++ b/test/Writer/Renderer/Entry/RssTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/Renderer/Feed/AtomTest.php b/test/Writer/Renderer/Feed/AtomTest.php
index 8039e518..a2c6c3d4 100644
--- a/test/Writer/Renderer/Feed/AtomTest.php
+++ b/test/Writer/Renderer/Feed/AtomTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Writer/Renderer/Feed/RssTest.php b/test/Writer/Renderer/Feed/RssTest.php
index 0e9db489..02b23c1e 100644
--- a/test/Writer/Renderer/Feed/RssTest.php
+++ b/test/Writer/Renderer/Feed/RssTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**