[mongodb/el5/master: 3/3] merge master to el5

[Nathaniel McCallum]

commit b11ed058c8820d7aa6983a4bfa9b93a4c1b0b420
Merge: c1f4cf5 8ee4264
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Sat Mar 19 14:15:07 2011 -0400

    merge master to el5

 .gitignore      |    1 +
 mongodb.conf    |    1 +
 mongodb.spec    |   23 ++++++++---------------
 nonce_fix.patch |   10 ----------
 sources         |    2 +-
 5 files changed, 11 insertions(+), 26 deletions(-)
---