[php-pdepend-PHP-Depend/el6/master: 10/10] Merge branch 'master' into el6

[Christof Damian]

commit 43c7e0c9fdd788def6ce1f0f2e96ab0f458976bb
Merge: e615868 a5849eb
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 30 16:50:17 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-pdepend-PHP-Depend.spec
    	sources

 .gitignore                  |    2 +-
 php-pdepend-PHP-Depend.spec |    5 ++++-
 sources                     |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 26071e7,d5a22eb..156abe0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--PHP_Depend-0.9.16.tgz
+ PHP_Depend-0.9.17.tgz