[abi-compliance-checker/el6: 2/2] Merge branch 'master' into el6

[Orion Poplawski]

commit 9dfbc9a50cf75d307c17b9b666f0da760c6340fc
Merge: ead66f4 fd4129d
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Dec 18 19:47:03 2012 -0700

    Merge branch 'master' into el6

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