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

[Nathaniel McCallum]

commit 919b5708cb01dbcd43ad8054b103974b246ce974
Merge: 55085ac 08b5b18
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 16:00:33 2010 -0400

    Merge branch 'master' into f12

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