[mongodb/el5/master: 2/2] Merge branch 'master' into el5

[Nathaniel McCallum]

commit 88f1569374a0fa116fe49a902a626cd87f7ddb3a
Merge: 6f46c1f 08b5b18
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 16:00:48 2010 -0400

    Merge branch 'master' into el5

 mongodb.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---