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

[Nathaniel McCallum]

commit 339a7ba0f6051679c3599a0b972bcc64dfea8adf
Merge: cbcb8b5 08b5b18
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 16:00:03 2010 -0400

    Merge branch 'master' into f14

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