[php-doctrine-Doctrine/el6/master: 8/8] Merge branch 'master' into el6

[Christof Damian]

commit 34cba9533319b80fa0feb44b00e7037f3e1a3f43
Merge: 2312d95 2fd32d6
Author: Christof Damian <christof at damian.net>
Date:   Thu Aug 26 08:31:16 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-doctrine-Doctrine.spec
    	sources

 .gitignore                 |    2 +-
 php-doctrine-Doctrine.spec |   24 ++++++++++++++----------
 sources                    |    2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 3942ef8,1874e41..53e2452
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Doctrine-1.2.2.tgz
+ /Doctrine-1.2.3.tgz