[mongodb/el5/master] (2 commits) ...Merge remote branch 'origin/master' into el5

[Nathaniel McCallum]

Summary of changes:

  8e7d320... fix missing %{_initddir} (*)
  6f46c1f... Merge remote branch 'origin/master' into el5

(*) This commit already existed in another branch; no separate mail sent