[mongodb/el6/master: 7/7] Merge remote branch 'origin/master' into el6

[Nathaniel McCallum]

commit 367b2abf1ed4aeceb4de265b26bbefb92b0d4b62
Merge: da65ae9 8e7d320
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 15:29:10 2010 -0400

    Merge remote branch 'origin/master' into el6

 mongodb.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---