Merge branch 'zf2phpunit35' of http://github.com/billkarwin/zf2 into …

…merges/karwin-phpunit35

Conflicts:
	library/Zend/Filter/Encrypt/Openssl.php
	library/Zend/Service/Akismet/Akismet.php
	library/Zend/Service/Amazon/Amazon.php
	library/Zend/Service/Amazon/Exception.php
	library/Zend/Service/Amazon/Query.php
	library/Zend/Service/Audioscrobbler/Audioscrobbler.php
	library/Zend/Service/SlideShare/Exception.php
	tests/Zend/Layout/FunctionalTest.php
	tests/Zend/Markup/ParserIntegrityTest.php
	tests/Zend/Server/ReflectionTest.php
	tests/Zend/Service/Akismet/AkismetTest.php
	tests/Zend/Service/Audioscrobbler/AlbumDataTest.php
	tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php
	tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php
	tests/Zend/Tag/ItemListTest.php
	tests/Zend/Tag/ItemTest.php
	tests/Zend/Text/MultiByteTest.php
	tests/Zend/Text/TableTest.php
	tests/Zend/Translate/Adapter/XmlTmTest.php
	tests/Zend/Validator/BarcodeTest.php
	tests/Zend/Validator/CallbackTest.php
	tests/Zend/Validator/File/FilesSizeTest.php
	tests/Zend/Validator/File/ImageSizeTest.php
	tests/Zend/Validator/File/SizeTest.php
	tests/Zend/Validator/File/UploadTest.php
	tests/Zend/Validator/File/WordCountTest.php
	tests/Zend/Validator/IbanTest.php
	tests/Zend/Validator/MessageTest.php
	tests/Zend/Validator/PostCodeTest.php
	tests/Zend/Validator/RegexTest.php
	tests/Zend/Validator/ValidateTest.php

test/Object/TestAsset/BarcodeTest.php

@@ -1,6 +1,34 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @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
+ */
+
 namespace ZendTest\Barcode\Object\TestAsset;
 
+/**
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @subpackage UnitTests
+ * @group      Zend_Barcode
+ * @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 BarcodeTest extends \Zend\Barcode\Object\AbstractObject
 {