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

[Nathaniel McCallum]

commit c53ea0cc514c6936a7a6597377ea612d650324fb
Merge: 4354370 b7a7b86
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 8 15:11:49 2010 -0400

    Merge remote branch 'origin/master' into f13

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