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

[Christof Damian]

commit 99290dce212606cfe25f8efe96d150a510816ecf
Merge: 34cba95 f0399d0
Author: Christof Damian <christof at damian.net>
Date:   Thu Mar 24 21:08:50 2011 +0100

    Merge branch 'master' into el6

 .gitignore                 |    1 +
 php-doctrine-Doctrine.spec |    8 +++++++-
 sources                    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 53e2452,1461f0d..58bfb23
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -Doctrine-1.2.2.tgz
  /Doctrine-1.2.3.tgz
+ /Doctrine-1.2.4.tgz