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

[rmattes]

commit fbdcbfa8b5f5dfbd2bce8a32c2546bbbdb3ee91f
Merge: de30e85 b91e0ca
Author: Rich Mattes <richmattes at gmail.com>
Date:   Wed Nov 27 13:02:35 2013 -0500

    Merge branch 'master' into el6

 .gitignore    |    1 +
 sdformat.spec |    9 ++++++---
 sources       |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---