[mongodb/el5/master: 6/6] Merge remote branch 'origin/master' into el5

[Nathaniel McCallum]

commit 4c89b2d791671b685fda492dbd2262772fc41d22
Merge: d9c92ec b7a7b86
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 15:11:49 2010 -0400

    Merge remote branch 'origin/master' into el5

 mongodb.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---