[php-pecl-mongo/el6: 7/7] Merge branch 'master' into el6

[Christof Damian]

commit 6fbdd52e93c3b32bbbdce6900d9bbd858bfd370b
Merge: d7ba584 a2bac32
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 18:18:02 2012 +0100

    Merge branch 'master' into el6

 .gitignore          |    2 +-
 php-pecl-mongo.spec |   32 +++++++++++++++++++++++++-------
 sources             |    2 +-
 3 files changed, 27 insertions(+), 9 deletions(-)
---