[php-pear-PhpDocumentor/f16: 5/5] Merge branch 'master' into f16

[Christof Damian]

commit 20bbcd377ab13492787d1f950c9c19ac58c0caa5
Merge: 9d152b7 97e29c6
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 13:46:53 2012 +0100

    Merge branch 'master' into f16

 .gitignore                  |    1 +
 php-pear-PhpDocumentor.spec |   82 +++++++++++++++++++++---------------------
 sources                     |    2 +-
 3 files changed, 43 insertions(+), 42 deletions(-)
---