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

[rcurtin]

commit da99b6f31292381d42918910e5411818d5220676
Merge: 652513f e5c12ef
Author: Ryan Curtin <gth671b at mail.gatech.edu>
Date:   Fri Feb 8 18:43:38 2013 -0500

    Merge branch 'master' into el6

 .gitignore     |    1 +
 armadillo.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---