[mongodb/f12/master: 8/8] Merge remote branch 'origin/master' into f12

[Nathaniel McCallum]

commit 55085ac64550f8796f5fbed9db541e2b7d04269f
Merge: 7133b60 8e7d320
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 15:28:50 2010 -0400

    Merge remote branch 'origin/master' into f12

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