[php-phpunit-PHP-TokenStream/el6/master: 10/10] Merge branch 'master' into el6

[Christof Damian]

commit dd25a05dbe79143a0f56dc3c7590d97d60e41449
Merge: 3615b47 9cd3e03
Author: Christof Damian <christof at damian.net>
Date:   Sat Dec 4 11:46:34 2010 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                       |    2 +-
 php-phpunit-PHP-TokenStream.spec |    5 ++++-
 sources                          |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---