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

[conrads]

commit e12eefae0244cda2bc94acee341bfe4d3d68f8be
Merge: c3a4dea 9cd52a4
Author: Conrad Sanderson <conrad /att/ nospam /dott/ linux /dott/ com>
Date:   Thu Sep 15 13:07:26 2011 +1000

    Merge branch 'master' into el6

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