[mpir/f18: 2/2] Merge branch 'master' into f18, discarding a now irrelevant commit that was made on the f18 branch,

[Jerry James]

commit c279fa98cedd8d7a32c2883b80b64e34159124aa
Merge: f5bfae2 086a2d6
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Wed Sep 12 14:29:03 2012 -0600

    Merge branch 'master' into f18, discarding a now irrelevant commit
    that was made on the f18 branch, but never pushed to master.

 .gitignore                   |    2 +-
 mpir-1.3.1-mkdir_p_fix.patch |   14 ------
 mpir-1.3.1-s390x.patch       |   74 -------------------------------
 mpir.spec                    |   99 ++++++++++++++++--------------------------
 sources                      |    2 +-
 5 files changed, 39 insertions(+), 152 deletions(-)
---