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

[Christof Damian]

commit 687ba53621f81c7ca82b1882de167bbfef79ca4f
Merge: d7ba584 a2bac32
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 18:34:34 2012 +0100

    Merge branch 'master' into el5

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