[php-pdepend-PHP-Depend/f13/master: 9/9] Merge branch 'master' into f13

[Christof Damian]

commit c046f726b82217473df38c74f4e8641943044841
Merge: 8b5210c a5849eb
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 30 16:43:15 2010 +0200

    Merge branch 'master' into f13
    
    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