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

[Nathaniel McCallum]

commit 6f46c1f751f9cecc6c5f426f7de8dd47238a660e
Merge: 4c89b2d 8e7d320
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 15:29:00 2010 -0400

    Merge remote branch 'origin/master' into el5

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