[armadillo/el6: 4/4] Merge branch 'master' into el6

[rcurtin]

commit 8e6f51caf17db75e8ba92bdeaa8c3ceb0d0d0ad5
Merge: 39a8a73 020c40f
Author: Ryan Curtin <gth671b at mail.gatech.edu>
Date:   Sun Apr 14 22:06:35 2013 -0400

    Merge branch 'master' into el6

 .gitignore     |   12 +----
 armadillo.spec |  135 +++++--------------------------------------------------
 sources        |    2 +-
 3 files changed, 16 insertions(+), 133 deletions(-)
---