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

[Rex Dieter]

commit 0fad7d1349a54b90c307aafe1c1dad99aeaeeed8
Merge: 4081e09 8c56db3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 15:32:17 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	analitza.spec
    	sources

 .gitignore    |    3 +--
 analitza.spec |   25 ++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---