[analitza/f17: 2/2] Merge branch 'master' into f17

[Rex Dieter]

commit b223e3c4fea60962e170ded6da967dae10b65cc6
Merge: 0fad7d1 35cad87
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 13:12:33 2012 -0500

    Merge branch 'master' into f17

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