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

[tdawson]

commit c7fe7265db39bbe4f604f87c58264ec4980df5b3
Merge: 8adc46e 0c1005d
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Feb 5 09:48:31 2013 -0600

    Merge branch 'master' into f18

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